mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove an unreachable branch from the OP_Affinity suppression logic.

Browse Source 
FossilOrigin-Name: 598727e6dae87f133c658fa125684f6ad978be60
This commit is contained in:
drh 2009-11-19 15:44:53 +00:00
parent c4c54eed2e
commit 88376ca791
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
manifest
View File

@ -1,5 +1,8 @@
C Merge\sfts3-refactor\sinto\sthe\smain\strunk.
D 2009-11-19T15:26:54
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
C Remove\san\sunreachable\sbranch\sfrom\sthe\sOP_Affinity\ssuppression\slogic.
D 2009-11-19T15:44:54
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in 7f6c6aa7feeeb5e26e01b344161d9aa1b5d64177
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@ -116,7 +119,7 @@ F src/callback.c 908f3e0172c3d4058f4ca0acd42c637c52e9669f
F src/complete.c 417df1ef5ea798532bb6290b0cc4265fef82980a
F src/date.c a79c0a8f219370b972e320741f995a3bef9df33f
F src/delete.c ec04635d152debdab70d4b30c5516b59282075ea
F src/expr.c be7f3db3e3b57f1f66f7a2acc445e8cb03fbd5a5
F src/expr.c bd248461bfb8290e3bb1da668660d42ab1a75464
F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
F src/fkey.c e2116672a6bd610dc888e27df292ebc7999c9bb0
F src/func.c bf54e1202cbfb28bf4b1fd9b58899009ae76716f
@ -772,7 +775,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P 4bd43307090258f8652c995b056101c51b81274a 3b17924754343c0163464dabf01a9c46ffccef28
R 627d84d1c58a3ccfd8d073223703a50a
U dan
Z 3f2064eaa4e1d7bebb28fcd8b8486169
P 551dbe30eab5855756e6356f6ba050f5d1791ef8
R 98fe94712ce9c4ce5fa5e8d58cfa92bf
U drh
Z 61a2e8b4c8dda3fa21ce648b9b7f7137
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFLBWf5oxKgR168RlERAqg4AJ47XOftrmGz8qV1h2XK2I/2UAR9lwCcDjeL
jLozHQcgaZloRi252xg/qY4=
=SPdi
-----END PGP SIGNATURE-----

2
manifest.uuid
View File

@ -1 +1 @@
551dbe30eab5855756e6356f6ba050f5d1791ef8
598727e6dae87f133c658fa125684f6ad978be60

5
src/expr.c
View File

@ -1336,8 +1336,9 @@ int sqlite3ExprNeedsNoAffinityChange(const Expr *p, char aff){
return 1;
}
case TK_COLUMN: {
return p->iTable>=0 && p->iColumn<0
&& (aff==SQLITE_AFF_INTEGER || aff==SQLITE_AFF_NUMERIC);
assert( p->iTable>=0 ); /* p cannot be part of a CHECK constraint */
return p->iColumn<0
&& (aff==SQLITE_AFF_INTEGER || aff==SQLITE_AFF_NUMERIC);
}
default: {
return 0;