aboutsummaryrefslogtreecommitdiff
path: root/src/expr.c
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2019-08-31 01:33:19 +0000
committerdrh <drh@noemail.net>2019-08-31 01:33:19 +0000
commit6a19865ff2f39ed313462da7e0e204b6ff3eb8b0 (patch)
tree20713d5f18cc8eae3d2e16ca16a25d6e2110953f /src/expr.c
parent7314495ff82c0ed4ac6f2776121282e3a8fe566a (diff)
downloadsqlite-6a19865ff2f39ed313462da7e0e204b6ff3eb8b0.tar.gz
sqlite-6a19865ff2f39ed313462da7e0e204b6ff3eb8b0.zip
Remove some affinity tests that became unreachable due to the prior change.
FossilOrigin-Name: e2db1123faac26c0e0b6a1ebef1685ea7633bfcafd1ff743ba5380700f7745af
Diffstat (limited to 'src/expr.c')
-rw-r--r--src/expr.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/expr.c b/src/expr.c
index e87ff7050..0332dc3e5 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -2203,10 +2203,10 @@ int sqlite3ExprNeedsNoAffinityChange(const Expr *p, char aff){
if( op==TK_REGISTER ) op = p->op2;
switch( op ){
case TK_INTEGER: {
- return aff==SQLITE_AFF_INTEGER || aff==SQLITE_AFF_NUMERIC;
+ return aff>=SQLITE_AFF_NUMERIC;
}
case TK_FLOAT: {
- return aff==SQLITE_AFF_REAL || aff==SQLITE_AFF_NUMERIC;
+ return aff>=SQLITE_AFF_NUMERIC;
}
case TK_STRING: {
return !unaryMinus && aff==SQLITE_AFF_TEXT;
@@ -2216,8 +2216,7 @@ int sqlite3ExprNeedsNoAffinityChange(const Expr *p, char aff){
}
case TK_COLUMN: {
assert( p->iTable>=0 ); /* p cannot be part of a CHECK constraint */
- return p->iColumn<0
- && (aff==SQLITE_AFF_INTEGER || aff==SQLITE_AFF_NUMERIC);
+ return aff>=SQLITE_AFF_NUMERIC && p->iColumn<0;
}
default: {
return 0;