From: drh Date: Fri, 14 Jul 2017 19:22:08 +0000 (+0000) Subject: Add requirements marks for some of the new features in the 3.20 release. X-Git-Tag: version-3.20.0~45 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3cef3649667c90a3f7e40fc57c7b0038908c18c6;p=thirdparty%2Fsqlite.git Add requirements marks for some of the new features in the 3.20 release. FossilOrigin-Name: 264238671379306b14d62a6ddaefd2a20acd34ca77276b6ce872253160fe0146 --- diff --git a/manifest b/manifest index 1e0c75b36f..b74466039f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Tweak\sMakefile.in\sso\sthat\stestfixture\scan\sbe\sbuilt\swith\sthe\n--disable-amalgamation\sconfigure\sswitch. -D 2017-07-14T19:12:26.938 +C Add\srequirements\smarks\sfor\ssome\sof\sthe\snew\sfeatures\sin\sthe\s3.20\srelease. +D 2017-07-14T19:22:08.974 F Makefile.in eda8bedf08c4c93e2137ef1218b3d3302488c68c2774918de0335a1133aab157 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.msc 20850e3e8d4d4791e0531955852d768eb06f24138214870d543abb1a47346fba @@ -407,7 +407,7 @@ F src/delete.c 3213547e97b676c6fa79948b7a9ede4801ea04a01a2043241deafedf132ecf5d F src/expr.c f3f0f7a1a8f91e980244152e9e0263144a9db862e715a80c70422faa2fde4f2f F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c 5ff2c895fe087756d8085dc1a9bc229b5670e2a65c3929dd87c71e43649af333 -F src/func.c 7647140a8624c66cc6e34bdf8005a92390253d6272e87c7901dc8065b563d435 +F src/func.c e2854b19386b93ad6b498a3f3b7d6baa98ec14cfe84530fb12fce4414263d871 F src/global.c 8a6ab6b4d91effb96ffa81b39f0d70c862abca157f8aaa194600a4a8b7923344 F src/hash.c a12580e143f10301ed5166ea4964ae2853d3905a511d4e0c44497245c7ce1f7a F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4 @@ -446,7 +446,7 @@ F src/pcache.h 521bb9610d38ef17a3cc9b5ddafd4546c2ea67fa3d0e464823d73c2a28d50e11 F src/pcache1.c 1195a21fe28e223e024f900b2011e80df53793f0356a24caace4188b098540dc F src/pragma.c 54e64a9d65e2c3b6ef11d4ca732c6abc8b67f5e886f222ffe2cbf3506c4efbd2 F src/pragma.h bb83728944b42f6d409c77f5838a8edbdb0fe83046c5496ffc9602b40340a324 -F src/prepare.c 4b84ae7458febe1df3e04ae62ba56abc851f771340e460d14426e6802c5615f4 +F src/prepare.c dd250f904739b1dc449c131ac527c35e3424d94082dd111321bd83f80c6bb0fe F src/printf.c 8757834f1b54dae512fb25eb1acc8e94a0d15dd2290b58f2563f65973265adb2 F src/random.c 80f5d666f23feb3e6665a6ce04c7197212a88384 F src/resolve.c 4324a94573b1e29286f8121e4881db59eaedc014afeb274c8d3e07ed282e0e20 @@ -1633,7 +1633,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 1eb56fe0305f0841b14865b7560add3da529b211328f5fa171b9628418a6ed49 -R bdfd0a46b51c03162f4cc2fd3159a1f5 -U dan -Z eda9defa0d1a29418a1b0b8c76434e30 +P 394c6f4f4376bc3d7796ea4157ba2ae230b0ca950774eff127ae6ef8a7b08602 +R 9a10092385bb5550deb258f9f1bb1913 +U drh +Z d4da94f8403e0d025b1a3aa613ff85cd diff --git a/manifest.uuid b/manifest.uuid index 767da08107..221afdfca7 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -394c6f4f4376bc3d7796ea4157ba2ae230b0ca950774eff127ae6ef8a7b08602 \ No newline at end of file +264238671379306b14d62a6ddaefd2a20acd34ca77276b6ce872253160fe0146 \ No newline at end of file diff --git a/src/func.c b/src/func.c index e59432e370..fd5458ad3d 100644 --- a/src/func.c +++ b/src/func.c @@ -85,6 +85,10 @@ static void typeofFunc( assert( SQLITE_TEXT==3 ); assert( SQLITE_BLOB==4 ); assert( SQLITE_NULL==5 ); + /* EVIDENCE-OF: R-01470-60482 The sqlite3_value_type(V) interface returns + ** the datatype code for the initial datatype of the sqlite3_value object + ** V. The returned value is one of SQLITE_INTEGER, SQLITE_FLOAT, + ** SQLITE_TEXT, SQLITE_BLOB, or SQLITE_NULL. */ sqlite3_result_text(context, azType[i], -1, SQLITE_STATIC); } diff --git a/src/prepare.c b/src/prepare.c index fb885101df..17fbf66d38 100644 --- a/src/prepare.c +++ b/src/prepare.c @@ -765,9 +765,14 @@ int sqlite3_prepare_v2( const char **pzTail /* OUT: End of parsed string */ ){ int rc; + /* EVIDENCE-OF: R-37923-12173 The sqlite3_prepare_v2() interface works + ** exactly the same as sqlite3_prepare_v3() with a zero prepFlags + ** parameter. + ** + ** Proof in that the 5th parameter to sqlite3LockAndPrepare is 0 */ rc = sqlite3LockAndPrepare(db,zSql,nBytes,SQLITE_PREPARE_SAVESQL,0, ppStmt,pzTail); - assert( rc==SQLITE_OK || ppStmt==0 || *ppStmt==0 ); /* VERIFY: F13021 */ + assert( rc==SQLITE_OK || ppStmt==0 || *ppStmt==0 ); return rc; } int sqlite3_prepare_v3( @@ -779,10 +784,17 @@ int sqlite3_prepare_v3( const char **pzTail /* OUT: End of parsed string */ ){ int rc; + /* EVIDENCE-OF: R-56861-42673 sqlite3_prepare_v3() differs from + ** sqlite3_prepare_v2() only in having the extra prepFlags parameter, + ** which is a bit array consisting of zero or more of the + ** SQLITE_PREPARE_* flags. + ** + ** Proof by comparison to the implementation of sqlite3_prepare_v2() + ** directly above. */ rc = sqlite3LockAndPrepare(db,zSql,nBytes, SQLITE_PREPARE_SAVESQL|(prepFlags&SQLITE_PREPARE_MASK), 0,ppStmt,pzTail); - assert( rc==SQLITE_OK || ppStmt==0 || *ppStmt==0 ); /* VERIFY: F13021 */ + assert( rc==SQLITE_OK || ppStmt==0 || *ppStmt==0 ); return rc; }