Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Revise the affinity returned for expressions flagged as 'generic'. Fix for [9a8b09f8e6]. |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
92f7ad43dbfe4e02490df2f932c3c74f |
User & Date: | mistachkin 2014-06-26 21:28:21.292 |
Context
2014-06-26
| ||
22:17 | Add some more IN operator tests. (check-in: fb32e374b7 user: mistachkin tags: trunk) | |
21:28 | Revise the affinity returned for expressions flagged as 'generic'. Fix for [9a8b09f8e6]. (check-in: 92f7ad43db user: mistachkin tags: trunk) | |
2014-06-24
| ||
20:19 | Fix showstat4.c so that it decodes typecodes 8 and 9 correctly. (check-in: 9ca737c0b4 user: drh tags: trunk) | |
Changes
Changes to src/expr.c.
︙ | ︙ | |||
29 30 31 32 33 34 35 | ** SELECT * FROM t1 WHERE a; ** SELECT a AS b FROM t1 WHERE b; ** SELECT * FROM t1 WHERE (select a from t1); */ char sqlite3ExprAffinity(Expr *pExpr){ int op; pExpr = sqlite3ExprSkipCollate(pExpr); | | | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | ** SELECT * FROM t1 WHERE a; ** SELECT a AS b FROM t1 WHERE b; ** SELECT * FROM t1 WHERE (select a from t1); */ char sqlite3ExprAffinity(Expr *pExpr){ int op; pExpr = sqlite3ExprSkipCollate(pExpr); if( pExpr->flags & EP_Generic ) return 0; op = pExpr->op; if( op==TK_SELECT ){ assert( pExpr->flags&EP_xIsSelect ); return sqlite3ExprAffinity(pExpr->x.pSelect->pEList->a[0].pExpr); } #ifndef SQLITE_OMIT_CAST if( op==TK_CAST ){ |
︙ | ︙ |
Added test/tkt-9a8b09f8e6.test.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 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 |