Fix the declaration of the table implemented by DBSTAT so that it uses

correct datatypes.

FossilOrigin-Name: a1e1cdc51d1c68502f43ac72c28ba87cb1916a0d
This commit is contained in:
drh 2016-06-13 15:59:37 +00:00
parent debaa86c1c
commit 6c0e41b951
4 changed files with 12 additions and 12 deletions

View File

@ -1,5 +1,5 @@
C Fix\san\sincorrect\sassert()\sin\sthe\sbtree\slogic. C Fix\sthe\sdeclaration\sof\sthe\stable\simplemented\sby\sDBSTAT\sso\sthat\sit\suses\ncorrect\sdatatypes.
D 2016-06-13T12:51:20.365 D 2016-06-13T15:59:37.932
F Makefile.in f3f7d2060ce03af4584e711ef3a626ef0b1d6340 F Makefile.in f3f7d2060ce03af4584e711ef3a626ef0b1d6340
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc 50149765ef72f4e652b9a0f1f6462c4784bb9423 F Makefile.msc 50149765ef72f4e652b9a0f1f6462c4784bb9423
@ -334,7 +334,7 @@ F src/callback.c 2e76147783386374bf01b227f752c81ec872d730
F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e
F src/ctime.c 999a828425b35b8092a8cde25690e71c20906344 F src/ctime.c 999a828425b35b8092a8cde25690e71c20906344
F src/date.c 1cc9fb516ec9932c6fd4d2a0d2f8bc4480145c39 F src/date.c 1cc9fb516ec9932c6fd4d2a0d2f8bc4480145c39
F src/dbstat.c c845548d4346e606e2f2b7d2e714ace2b8a7dd1b F src/dbstat.c 4f6f7f52b49beb9636ffbd517cfe44a402ba4ad0
F src/delete.c 4aba4214a377ce8ddde2d2e609777bcc8235200f F src/delete.c 4aba4214a377ce8ddde2d2e609777bcc8235200f
F src/expr.c 798146ea4c87d723e8a157d88450ac9c43256998 F src/expr.c 798146ea4c87d723e8a157d88450ac9c43256998
F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
@ -1100,7 +1100,7 @@ F test/spellfix3.test 0f9efaaa502a0e0a09848028518a6fb096c8ad33
F test/sqldiff1.test 28cd737cf1b0078b1ec1bbf425e674c47785835e F test/sqldiff1.test 28cd737cf1b0078b1ec1bbf425e674c47785835e
F test/sqllimits1.test a74ee2a3740b9f9c2437c246d8fb77354862a142 F test/sqllimits1.test a74ee2a3740b9f9c2437c246d8fb77354862a142
F test/sqllog.test 6af6cb0b09f4e44e1917e06ce85be7670302517a F test/sqllog.test 6af6cb0b09f4e44e1917e06ce85be7670302517a
F test/stat.test 8544f219694807400c8fd1830e4ad858f5b1b23f F test/stat.test ab95d28503d0f6d98ffd8ce204643c9da090ebf1
F test/statfault.test f525a7bf633e50afd027700e9a486090684b1ac1 F test/statfault.test f525a7bf633e50afd027700e9a486090684b1ac1
F test/stmt.test 64844332db69cf1a735fcb3e11548557fc95392f F test/stmt.test 64844332db69cf1a735fcb3e11548557fc95392f
F test/subquery.test d7268d193dd33d5505df965399d3a594e76ae13f F test/subquery.test d7268d193dd33d5505df965399d3a594e76ae13f
@ -1501,7 +1501,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P d362ba157f993fc74a590cf15a9a2fa589278dd7 P fcf6114be94b260641e7c78a58db16a31ac5ab35
R 8b591288ef08b6290802dd112ec0668a R 39b9428988b60189530e38dc24c060de
U drh U drh
Z 9ef02259ea1748db703c32ac6cd57aa7 Z 57ee65d1a2a24e95107b0a8e8a3984a2

View File

@ -1 +1 @@
fcf6114be94b260641e7c78a58db16a31ac5ab35 a1e1cdc51d1c68502f43ac72c28ba87cb1916a0d

View File

@ -58,10 +58,10 @@
*/ */
#define VTAB_SCHEMA \ #define VTAB_SCHEMA \
"CREATE TABLE xx( " \ "CREATE TABLE xx( " \
" name STRING, /* Name of table or index */" \ " name TEXT, /* Name of table or index */" \
" path INTEGER, /* Path to page from root */" \ " path TEXT, /* Path to page from root */" \
" pageno INTEGER, /* Page number */" \ " pageno INTEGER, /* Page number */" \
" pagetype STRING, /* 'internal', 'leaf' or 'overflow' */" \ " pagetype TEXT, /* 'internal', 'leaf' or 'overflow' */" \
" ncell INTEGER, /* Cells on page (0 for overflow) */" \ " ncell INTEGER, /* Cells on page (0 for overflow) */" \
" payload INTEGER, /* Bytes of payload on this page */" \ " payload INTEGER, /* Bytes of payload on this page */" \
" unused INTEGER, /* Bytes of unused space on this page */" \ " unused INTEGER, /* Bytes of unused space on this page */" \

View File

@ -33,7 +33,7 @@ db func a_string a_string
register_dbstat_vtab db register_dbstat_vtab db
do_execsql_test stat-0.0 { do_execsql_test stat-0.0 {
PRAGMA table_info(dbstat); PRAGMA table_info(dbstat);
} {/0 name STRING .* 1 path INTEGER .* 9 pgsize INTEGER/} } {/0 name TEXT .* 1 path TEXT .* 9 pgsize INTEGER/}
do_execsql_test stat-0.1 { do_execsql_test stat-0.1 {
PRAGMA auto_vacuum = OFF; PRAGMA auto_vacuum = OFF;
CREATE VIRTUAL TABLE temp.stat USING dbstat; CREATE VIRTUAL TABLE temp.stat USING dbstat;