1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-12 13:01:09 +03:00

Put the affinity() function implementation inside of #ifdef SQLITE_DEBUG.

FossilOrigin-Name: f778f58ae4ea3e16f51b94591a2c1e563dcb0cde
This commit is contained in:
drh
2017-01-03 14:39:30 +00:00
parent 01e64a1704
commit 5424075137
4 changed files with 12 additions and 8 deletions

View File

@@ -1,5 +1,5 @@
C Merge\sall\sthe\slatest\schanges\sfrom\strunk.
D 2017-01-03T14:30:28.465
C Put\sthe\saffinity()\sfunction\simplementation\sinside\sof\s#ifdef\sSQLITE_DEBUG.
D 2017-01-03T14:39:30.860
F Makefile.in 41bd4cad981487345c4a84081074bcdb876e4b2e
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc b8ca53350ae545e3562403d5da2a69cec79308da
@@ -341,10 +341,10 @@ F src/ctime.c 9f2296a4e5d26ebf0e0d95a0af4628f1ea694e7a
F src/date.c dc3f1391d9297f8c748132813aaffcb117090d6e
F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
F src/delete.c c8bc10d145c9666a34ae906250326fdaa8d58fa5
F src/expr.c 3cf3bb3b5de2494d0f7b30c999984fd2918b4ef5
F src/expr.c 449cbb8b9857ff8eb685b72555086818a178858c
F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007
F src/fkey.c 2e9aabe1aee76273aff8a84ee92c464e095400ae
F src/func.c 04350956b6e45800f71e02e0ffeae2a35aff2634
F src/func.c c67273e1ec08abbdcc14c189892a3ff6eeece86b
F src/global.c 4a34512d82fc5aa13c802db06bcfff5e1d3de955
F src/hash.c 63d0ee752a3b92d4695b2b1f5259c4621b2cfebd
F src/hash.h ab34c5c54a9e9de2e790b24349ba5aab3dbb4fd4
@@ -1541,7 +1541,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 57e40e1cb1bcd3dd8473d2fdeecc9c7ff3d6192b 36944be6be5c42096f5da84187ff203af26b08ae
R e122a5b19a6af1a9b03b2065c0a3a3fe
P c27cd8a8127b81d3176f6a5b9915c9b3c69574fb
R 4de702ec2e06c17a2db8893398d4255a
U drh
Z 5f2d809963b79f73c941be08881302f0
Z f4b6e6ab3f6bbd45ad65d1c563858923

View File

@@ -1 +1 @@
c27cd8a8127b81d3176f6a5b9915c9b3c69574fb
f778f58ae4ea3e16f51b94591a2c1e563dcb0cde

View File

@@ -3660,6 +3660,7 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
return sqlite3ExprCodeTarget(pParse, pFarg->a[0].pExpr, target);
}
#ifdef SQLITE_DEBUG
/* The AFFINITY() function evaluates to a string that describes
** the type affinity of the argument. This is used for testing of
** the SQLite type logic.
@@ -3673,6 +3674,7 @@ int sqlite3ExprCodeTarget(Parse *pParse, Expr *pExpr, int target){
aff ? azAff[aff-SQLITE_AFF_BLOB] : "none");
return target;
}
#endif
for(i=0; i<nFarg; i++){
if( i<32 && sqlite3ExprIsConstant(pFarg->a[i].pExpr) ){

View File

@@ -1775,7 +1775,9 @@ void sqlite3RegisterBuiltinFunctions(void){
FUNCTION2(unlikely, 1, 0, 0, noopFunc, SQLITE_FUNC_UNLIKELY),
FUNCTION2(likelihood, 2, 0, 0, noopFunc, SQLITE_FUNC_UNLIKELY),
FUNCTION2(likely, 1, 0, 0, noopFunc, SQLITE_FUNC_UNLIKELY),
#ifdef SQLITE_DEBUG
FUNCTION2(affinity, 1, 0, 0, noopFunc, SQLITE_FUNC_AFFINITY),
#endif
FUNCTION(ltrim, 1, 1, 0, trimFunc ),
FUNCTION(ltrim, 2, 1, 0, trimFunc ),
FUNCTION(rtrim, 1, 2, 0, trimFunc ),