database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-12-09 10:21:35 +03:00
Code Activity

Remove an unreachable branch from sqlite3ExprAffinity()

Browse Source 
FossilOrigin-Name: 9d96f61481704e5ec399ee425f0ebb246902ecc5
This commit is contained in:
drh
2016-08-26 01:02:09 +00:00
parent 3cc19132da
commit a28f85b076
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@@ -1,5 +1,5 @@
C Merge\srecent\schanges\sfrom\strunk. C Remove\san\sunreachable\sbranch\sfrom\ssqlite3ExprAffinity()
D 2016-08-25T22:31:44.503 D 2016-08-26T01:02:09.972
F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088 F Makefile.in cfd8fb987cd7a6af046daa87daa146d5aad0e088
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc 5017381e4853b1472e01d5bb926be1268eba429c F Makefile.msc 5017381e4853b1472e01d5bb926be1268eba429c
@@ -338,7 +338,7 @@ F src/ctime.c e77f3dc297b4b65c96da78b4ae4272fdfae863d7
F src/date.c 95c9a8d00767e7221a8e9a31f4e913fc8029bf6b F src/date.c 95c9a8d00767e7221a8e9a31f4e913fc8029bf6b
F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d F src/dbstat.c 19ee7a4e89979d4df8e44cfac7a8f905ec89b77d
F src/delete.c 76c084f0265f4a3cd1ecf17eee112a94f1ccbc05 F src/delete.c 76c084f0265f4a3cd1ecf17eee112a94f1ccbc05
F src/expr.c 45f814e52d2279914bd7a9141d92a26cb71b1533 F src/expr.c 2fe35bc5e93ac4c692b0b8c563ed6fc022247ed4
F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
F src/fkey.c e2be0968c1adc679c87e467aa5b4f167588f38a8 F src/fkey.c e2be0968c1adc679c87e467aa5b4f167588f38a8
F src/func.c 29cc9acb170ec1387b9f63eb52cd85f8de96c771 F src/func.c 29cc9acb170ec1387b9f63eb52cd85f8de96c771
@@ -1521,7 +1521,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 b56705ae6374db9db82613ef89faa1a1e6b00a18 37e6c54b1afc634844026b3fe874dd2d550c6558 P 5789aab8ef59ae1cdfdae123b078ee03da6e08ed
R 2a905e6de196a1adbfb5e3026f93f057 R 9ebda3b476f4e068ca78a071831449eb
U drh U drh
Z 71128db26f4e518aa8ba75a034627d25 Z ef957217ed40f2345a57bc50f3f65b90

2
manifest.uuid
View File

@@ -1 +1 @@
5789aab8ef59ae1cdfdae123b078ee03da6e08ed 9d96f61481704e5ec399ee425f0ebb246902ecc5

3
src/expr.c
View File

@@ -51,8 +51,9 @@ char sqlite3ExprAffinity(Expr *pExpr){
return sqlite3AffinityType(pExpr->u.zToken, 0); return sqlite3AffinityType(pExpr->u.zToken, 0);
} }
#endif #endif
if( (op==TK_AGG_COLUMN || op==TK_COLUMN) && pExpr->pTab!=0 ){ if( op==TK_AGG_COLUMN || op==TK_COLUMN ){
int j = pExpr->iColumn; int j = pExpr->iColumn;
assert( pExpr->pTab!=0 );
if( j<0 ) return SQLITE_AFF_INTEGER; if( j<0 ) return SQLITE_AFF_INTEGER;
assert( pExpr->pTab && j<pExpr->pTab->nCol ); assert( pExpr->pTab && j<pExpr->pTab->nCol );
return pExpr->pTab->aCol[j].affinity; return pExpr->pTab->aCol[j].affinity;