From: drh <> Date: Tue, 4 Apr 2023 18:59:38 +0000 (+0000) Subject: Fix an incorrect entry in the array that maps sqlite3_value values into X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=43a4ca8cb89fafeb8ee5dd603b86b30d48fa52f2;p=thirdparty%2Fsqlite.git Fix an incorrect entry in the array that maps sqlite3_value values into actual datatype numbers. FossilOrigin-Name: 80d518fb82ff8d837a35280460242ebb925c112024c29496d1804768a4c3efe8 --- diff --git a/manifest b/manifest index 89cb5d5232..42b81ac2fe 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Remove\san\sassert()\sstatement\sthat\sis\sno\slonger\svalid\sdue\sto\senhancements\nto\squery\splanner\sfor\simproved\suse\sof\sindexes. -D 2023-04-04T18:48:40.538 +C Fix\san\sincorrect\sentry\sin\sthe\sarray\sthat\smaps\ssqlite3_value\svalues\sinto\nactual\sdatatype\snumbers. +D 2023-04-04T18:59:38.450 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -694,7 +694,7 @@ F src/vacuum.c 84ce7f01f8a7a08748e107a441db83bcec13970190ddcb0c9ff522adbc1c23fd F src/vdbe.c 7415af77b86d79e51298b7be58c2e419263bc148c6ea8db9cd12e8c26197de09 F src/vdbe.h 73b904a6b3bb27f308c6cc287a5751ebc7f1f89456be0ed068a12b92844c6e8c F src/vdbeInt.h a4147a4ddf613cb1bcb555ace9e9e74a9c099d65facd88155f191b1fb4d74cfb -F src/vdbeapi.c 998d240b3afd78df3581d545240330ca4cc09ecd10d0af730fe364f1c7eb253d +F src/vdbeapi.c 41986f8c43ef4753a641ac10ac4169923ca5608c1e8afa0095f1385be406eb5e F src/vdbeaux.c 3f9e3b6585e7434aa11300169dd66ddf0fc963a0c6f7940bdc058335dadeb353 F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd F src/vdbemem.c cbd2305d6444dc0aa3ab0dbe8f45ca5166da6f5a9bb6402be9739b6443a83fd0 @@ -2046,9 +2046,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 7ea98aba78d10b26e1c8f67978a88a92aa2378dc50df9b5954bdd796affe4f9b -Q +2b23dd249d0bc254308f5539936d33ee558f1100dec616caac7317dbe70db761 -R 44116fed94558931b6570bb6d112bd25 +P 93fb8c66c5703a8af4c87acb2a60f6b3ea13e1d11b31ddea3032348660508ee8 +Q +fa8537dc90cad962dec695418d48da2890a172801ecad0c7c804023a063d3a02 +R d4e013e8d5cf7e533285396ad4863c10 U drh -Z 4e80d279a9669250e906bc5e203aa9de +Z e9b94d3e3763206f308ee8f0c53f00b7 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index db9ebd5b03..20dac81fb4 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -93fb8c66c5703a8af4c87acb2a60f6b3ea13e1d11b31ddea3032348660508ee8 \ No newline at end of file +80d518fb82ff8d837a35280460242ebb925c112024c29496d1804768a4c3efe8 \ No newline at end of file diff --git a/src/vdbeapi.c b/src/vdbeapi.c index 42f3bb0b40..abb097074b 100644 --- a/src/vdbeapi.c +++ b/src/vdbeapi.c @@ -271,7 +271,7 @@ int sqlite3_value_type(sqlite3_value* pVal){ SQLITE_NULL, /* 0x1f (not possible) */ SQLITE_FLOAT, /* 0x20 INTREAL */ SQLITE_NULL, /* 0x21 (not possible) */ - SQLITE_TEXT, /* 0x22 INTREAL + TEXT */ + SQLITE_FLOAT, /* 0x22 INTREAL + TEXT */ SQLITE_NULL, /* 0x23 (not possible) */ SQLITE_FLOAT, /* 0x24 (not possible) */ SQLITE_NULL, /* 0x25 (not possible) */