Remove an unreachable branch from sqlite3ExprAffinity()

FossilOrigin-Name: 9d96f61481704e5ec399ee425f0ebb246902ecc5

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

diff --git a/manifest.uuid b/manifest.uuid
index d27311b40f07e165f6bea6678cd5aabae8225bd6..d803bb5d8ad8a444a316dd434431ec9697a69855 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5789aab8ef59ae1cdfdae123b078ee03da6e08ed
\ No newline at end of file
+9d96f61481704e5ec399ee425f0ebb246902ecc5
\ No newline at end of file

diff --git a/src/expr.c b/src/expr.c
index ab0349dcb72611c851e138d8be02c426a4db934b..982605d196797072cd1c50542cd97d61f7b62b6a 100644 (file)
--- a/src/expr.c
+++ b/src/expr.c
@@ -51,8 +51,9 @@ char sqlite3ExprAffinity(Expr *pExpr){
     return sqlite3AffinityType(pExpr->u.zToken, 0);
   }
 #endif
-  if( (op==TK_AGG_COLUMN || op==TK_COLUMN) && pExpr->pTab!=0 ){
+  if( op==TK_AGG_COLUMN || op==TK_COLUMN ){
     int j = pExpr->iColumn;
+    assert( pExpr->pTab!=0 );
     if( j<0 ) return SQLITE_AFF_INTEGER;
     assert( pExpr->pTab && j<pExpr->pTab->nCol );
     return pExpr->pTab->aCol[j].affinity;