From: mistachkin <mistachkin@noemail.net>
Date: Thu, 26 Jun 2014 21:28:21 +0000 (+0000)
Subject: Revise the affinity returned for expressions flagged as 'generic'.  Fix for [9a8b09f8e6].
X-Git-Tag: version-3.8.6~96
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bec6fb3efce29aebf89a37f2fb134d16868dff9;p=thirdparty%2Fsqlite.git

Revise the affinity returned for expressions flagged as 'generic'.  Fix for [9a8b09f8e6].

FossilOrigin-Name: 92f7ad43dbfe4e02490df2f932c3c74fb89064d6
---

diff --git a/manifest b/manifest
index fea0a6e2cc..31eaa743e5 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sshowstat4.c\sso\sthat\sit\sdecodes\stypecodes\s8\sand\s9\scorrectly.
-D 2014-06-24T20:19:21.030
+C Revise\sthe\saffinity\sreturned\sfor\sexpressions\sflagged\sas\s'generic'.\s\sFix\sfor\s[9a8b09f8e6].
+D 2014-06-26T21:28:21.292
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in b03432313a3aad96c706f8164fb9f5307eaf19f5
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -176,7 +176,7 @@ F src/complete.c dc1d136c0feee03c2f7550bafc0d29075e36deac
 F src/ctime.c 0231df905e2c4abba4483ee18ffc05adc321df2a
 F src/date.c 593c744b2623971e45affd0bde347631bdfa4625
 F src/delete.c bcf8f72126cea80fc3d5bc5494cf19b3f8935aaf
-F src/expr.c 4f9e497c66e2f25a4d139357a778c84d5713207c
+F src/expr.c 40d06d1543b1355aa02efa9666178f7642a96ed6
 F src/fault.c 160a0c015b6c2629d3899ed2daf63d75754a32bb
 F src/fkey.c a549cff9fe8b736cdae21650ea0af6de29b77619
 F src/func.c 3bc223ea36cd29a91c481485343d0ee4257ab8dc
@@ -904,6 +904,7 @@ F test/tkt-868145d012.test a5f941107ece6a64410ca4755c6329b7eb57a356
 F test/tkt-8c63ff0ec.test 258b7fc8d7e4e1cb5362c7d65c143528b9c4cbed
 F test/tkt-91e2e8ba6f.test 08c4f94ae07696b05c9b822da0b4e5337a2f54c5
 F test/tkt-94c04eaadb.test f738c57c7f68ab8be1c054415af7774617cb6223
+F test/tkt-9a8b09f8e6.test 8b81b1fa5193246dbf5fe876929f71c3712ee755
 F test/tkt-9d68c883.test 458f7d82a523d7644b54b497c986378a7d8c8b67
 F test/tkt-9f2eb3abac.test 85bc63e749f050e6a61c8f9207f1eee65c9d3395
 F test/tkt-a7b7803e.test 159ef554234fa1f9fb318c751b284bd1cf858da4
@@ -1180,7 +1181,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P b4d9f6053d1d95fdc1eab8ce610b51e7df8d896d
-R 508dd98757238bd14305734cabeeae37
-U drh
-Z 96b01d8567714808bc64d5917b4d4853
+P 9ca737c0b41f87998d842e7772c3e483bb291c50
+R 4121a5e953ac74e556013274c6ab2f95
+U mistachkin
+Z 9298eeb693f0be09657ca6e474114119
diff --git a/manifest.uuid b/manifest.uuid
index 5313f68aef..1b2cca87bd 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-9ca737c0b41f87998d842e7772c3e483bb291c50
\ No newline at end of file
+92f7ad43dbfe4e02490df2f932c3c74fb89064d6
\ No newline at end of file
diff --git a/src/expr.c b/src/expr.c
index 08c121e386..803d93f30d 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -33,7 +33,7 @@
 char sqlite3ExprAffinity(Expr *pExpr){
   int op;
   pExpr = sqlite3ExprSkipCollate(pExpr);
-  if( pExpr->flags & EP_Generic ) return SQLITE_AFF_NONE;
+  if( pExpr->flags & EP_Generic ) return 0;
   op = pExpr->op;
   if( op==TK_SELECT ){
     assert( pExpr->flags&EP_xIsSelect );
diff --git a/test/tkt-9a8b09f8e6.test b/test/tkt-9a8b09f8e6.test
new file mode 100644
index 0000000000..6bd3db5de0
--- /dev/null
+++ b/test/tkt-9a8b09f8e6.test
@@ -0,0 +1,265 @@
+# 2014 June 26
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+# This file implements regression tests for SQLite library.
+#
+# This file implements tests to verify that ticket [9a8b09f8e6] has been
+# fixed.
+#
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+set testprefix tkt-9a8b09f8e6
+
+do_test 1.1 {
+  execsql {
+    CREATE TABLE t1(x TEXT);
+    INSERT INTO t1 VALUES('1');
+  }
+} {}
+
+do_test 1.2 {
+  execsql {
+    CREATE TABLE t2(x INTEGER);
+    INSERT INTO t2 VALUES(1);
+  }
+} {}
+
+do_test 1.3 {
+  execsql {
+    CREATE TABLE t3(x REAL);
+    INSERT INTO t3 VALUES(1.0);
+  }
+} {}
+
+do_test 1.4 {
+  execsql {
+    CREATE TABLE t4(x REAL);
+    INSERT INTO t4 VALUES(1.11);
+  }
+} {}
+
+do_test 2.1 {
+  execsql {
+    SELECT x FROM t1 WHERE x IN (1);
+  }
+} {1}
+
+do_test 2.2 {
+  execsql {
+    SELECT x FROM t1 WHERE x IN (1.0);
+  }
+} {}
+
+do_test 2.3 {
+  execsql {
+    SELECT x FROM t1 WHERE x IN ('1');
+  }
+} {1}
+
+do_test 2.4 {
+  execsql {
+    SELECT x FROM t1 WHERE x IN ('1.0');
+  }
+} {}
+
+do_test 2.5 {
+  execsql {
+    SELECT x FROM t1 WHERE 1 IN (x);
+  }
+} {}
+
+do_test 2.6 {
+  execsql {
+    SELECT x FROM t1 WHERE 1.0 IN (x);
+  }
+} {}
+
+do_test 2.7 {
+  execsql {
+    SELECT x FROM t1 WHERE '1' IN (x);
+  }
+} {1}
+
+do_test 2.8 {
+  execsql {
+    SELECT x FROM t1 WHERE '1.0' IN (x);
+  }
+} {}
+
+do_test 3.1 {
+  execsql {
+    SELECT x FROM t2 WHERE x IN (1);
+  }
+} {1}
+
+do_test 3.2 {
+  execsql {
+    SELECT x FROM t2 WHERE x IN (1.0);
+  }
+} {1}
+
+do_test 3.3 {
+  execsql {
+    SELECT x FROM t2 WHERE x IN ('1');
+  }
+} {1}
+
+do_test 3.4 {
+  execsql {
+    SELECT x FROM t2 WHERE x IN ('1.0');
+  }
+} {1}
+
+do_test 3.5 {
+  execsql {
+    SELECT x FROM t2 WHERE 1 IN (x);
+  }
+} {1}
+
+do_test 3.6 {
+  execsql {
+    SELECT x FROM t2 WHERE 1.0 IN (x);
+  }
+} {1}
+
+do_test 3.7 {
+  execsql {
+    SELECT x FROM t2 WHERE '1' IN (x);
+  }
+} {}
+
+do_test 3.8 {
+  execsql {
+    SELECT x FROM t2 WHERE '1.0' IN (x);
+  }
+} {}
+
+do_test 4.1 {
+  execsql {
+    SELECT x FROM t3 WHERE x IN (1);
+  }
+} {1.0}
+
+do_test 4.2 {
+  execsql {
+    SELECT x FROM t3 WHERE x IN (1.0);
+  }
+} {1.0}
+
+do_test 4.3 {
+  execsql {
+    SELECT x FROM t3 WHERE x IN ('1');
+  }
+} {1.0}
+
+do_test 4.4 {
+  execsql {
+    SELECT x FROM t3 WHERE x IN ('1.0');
+  }
+} {1.0}
+
+do_test 4.5 {
+  execsql {
+    SELECT x FROM t3 WHERE 1 IN (x);
+  }
+} {1.0}
+
+do_test 4.6 {
+  execsql {
+    SELECT x FROM t3 WHERE 1.0 IN (x);
+  }
+} {1.0}
+
+do_test 4.7 {
+  execsql {
+    SELECT x FROM t3 WHERE '1' IN (x);
+  }
+} {}
+
+do_test 4.8 {
+  execsql {
+    SELECT x FROM t3 WHERE '1.0' IN (x);
+  }
+} {}
+
+do_test 5.1 {
+  execsql {
+    SELECT x FROM t4 WHERE x IN (1);
+  }
+} {}
+
+do_test 5.2 {
+  execsql {
+    SELECT x FROM t4 WHERE x IN (1.0);
+  }
+} {}
+
+do_test 5.3 {
+  execsql {
+    SELECT x FROM t4 WHERE x IN ('1');
+  }
+} {}
+
+do_test 5.4 {
+  execsql {
+    SELECT x FROM t4 WHERE x IN ('1.0');
+  }
+} {}
+
+do_test 5.5 {
+  execsql {
+    SELECT x FROM t4 WHERE x IN (1.11);
+  }
+} {1.11}
+
+do_test 5.6 {
+  execsql {
+    SELECT x FROM t4 WHERE x IN ('1.11');
+  }
+} {1.11}
+
+do_test 5.7 {
+  execsql {
+    SELECT x FROM t4 WHERE 1 IN (x);
+  }
+} {}
+
+do_test 5.8 {
+  execsql {
+    SELECT x FROM t4 WHERE 1.0 IN (x);
+  }
+} {}
+
+do_test 5.9 {
+  execsql {
+    SELECT x FROM t4 WHERE '1' IN (x);
+  }
+} {}
+
+do_test 5.10 {
+  execsql {
+    SELECT x FROM t4 WHERE '1.0' IN (x);
+  }
+} {}
+
+do_test 5.11 {
+  execsql {
+    SELECT x FROM t4 WHERE 1.11 IN (x);
+  }
+} {1.11}
+
+do_test 5.12 {
+  execsql {
+    SELECT x FROM t4 WHERE '1.11' IN (x);
+  }
+} {}
+
+finish_test