Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch ticket-bfbf38e5e9 Excluding Merge-Ins
This is equivalent to a diff from 10cc12b16b to 62ebfa7476
2012-11-02
| ||
23:42 | Merge the fix for ticket [bfbf38e5e9956ac6] into trunk. (check-in: 4f7dfc32aa user: drh tags: trunk) | |
19:08 | Adding test cases for ticket [bfbf38e5e9956a] (Closed-Leaf check-in: 62ebfa7476 user: drh tags: ticket-bfbf38e5e9) | |
18:48 | Proposed fix for ticket [bfbf38e5e9]. (check-in: 18ae030dad user: drh tags: ticket-bfbf38e5e9) | |
18:24 | Fix an out-of-date comment. No changes to code. (check-in: 10cc12b16b user: drh tags: trunk) | |
2012-10-30
| ||
18:09 | Enable the use of coroutines as an alternative to manifesting views used in a FROM clause. (check-in: 9dca18f5fe user: drh tags: trunk) | |
Changes to src/expr.c.
︙ | ︙ | |||
4026 4027 4028 4029 4030 4031 4032 | } /* Make pExpr point to the appropriate pAggInfo->aFunc[] entry */ assert( !ExprHasAnyProperty(pExpr, EP_TokenOnly|EP_Reduced) ); ExprSetIrreducible(pExpr); pExpr->iAgg = (i16)i; pExpr->pAggInfo = pAggInfo; | > | | > | 4026 4027 4028 4029 4030 4031 4032 4033 4034 4035 4036 4037 4038 4039 4040 4041 4042 4043 | } /* Make pExpr point to the appropriate pAggInfo->aFunc[] entry */ assert( !ExprHasAnyProperty(pExpr, EP_TokenOnly|EP_Reduced) ); ExprSetIrreducible(pExpr); pExpr->iAgg = (i16)i; pExpr->pAggInfo = pAggInfo; return WRC_Prune; }else{ return WRC_Continue; } } } return WRC_Continue; } static int analyzeAggregatesInSelect(Walker *pWalker, Select *pSelect){ UNUSED_PARAMETER(pWalker); UNUSED_PARAMETER(pSelect); |
︙ | ︙ |
Changes to test/aggnested.test.
︙ | ︙ | |||
63 64 65 66 67 68 69 70 71 | REPLACE INTO t2 VALUES(2,99,999,9999); SELECT (SELECT GROUP_CONCAT(CASE WHEN a1=1 THEN'A' ELSE 'B' END) FROM t2), t1.* FROM t1; } } {A,B,B 3 33 333 3333} db2 close finish_test | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | REPLACE INTO t2 VALUES(2,99,999,9999); SELECT (SELECT GROUP_CONCAT(CASE WHEN a1=1 THEN'A' ELSE 'B' END) FROM t2), t1.* FROM t1; } } {A,B,B 3 33 333 3333} db2 close ##################### Test cases for ticket [bfbf38e5e9956ac69f] ############ # # This first test case is the original problem report: do_test aggnested-3.0 { db eval { CREATE TABLE AAA ( aaa_id INTEGER PRIMARY KEY AUTOINCREMENT ); CREATE TABLE RRR ( rrr_id INTEGER PRIMARY KEY AUTOINCREMENT, rrr_date INTEGER NOT NULL, rrr_aaa INTEGER ); CREATE TABLE TTT ( ttt_id INTEGER PRIMARY KEY AUTOINCREMENT, target_aaa INTEGER NOT NULL, source_aaa INTEGER NOT NULL ); insert into AAA (aaa_id) values (2); insert into TTT (ttt_id, target_aaa, source_aaa) values (4469, 2, 2); insert into TTT (ttt_id, target_aaa, source_aaa) values (4476, 2, 1); insert into RRR (rrr_id, rrr_date, rrr_aaa) values (0, 0, NULL); insert into RRR (rrr_id, rrr_date, rrr_aaa) values (2, 4312, 2); SELECT i.aaa_id, (SELECT sum(CASE WHEN (t.source_aaa == i.aaa_id) THEN 1 ELSE 0 END) FROM TTT t ) AS segfault FROM (SELECT curr.rrr_aaa as aaa_id FROM RRR curr -- you also can comment out the next line -- it causes segfault to happen after one row is outputted INNER JOIN AAA a ON (curr.rrr_aaa = aaa_id) LEFT JOIN RRR r ON (r.rrr_id <> 0 AND r.rrr_date < curr.rrr_date) GROUP BY curr.rrr_id HAVING r.rrr_date IS NULL ) i; } } {2 1} # Further variants of the test case, as found in the ticket # do_test aggnested-3.1 { db eval { DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t2; CREATE TABLE t1 ( id1 INTEGER PRIMARY KEY AUTOINCREMENT, value1 INTEGER ); INSERT INTO t1 VALUES(4469,2),(4476,1); CREATE TABLE t2 ( id2 INTEGER PRIMARY KEY AUTOINCREMENT, value2 INTEGER ); INSERT INTO t2 VALUES(0,1),(2,2); SELECT (SELECT sum(value2==xyz) FROM t2) FROM (SELECT curr.value1 as xyz FROM t1 AS curr LEFT JOIN t1 AS other GROUP BY curr.id1); } } {1 1} do_test aggnested-3.2 { db eval { DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t2; CREATE TABLE t1 ( id1 INTEGER, value1 INTEGER, x1 INTEGER ); INSERT INTO t1 VALUES(4469,2,98),(4469,1,99),(4469,3,97); CREATE TABLE t2 ( value2 INTEGER ); INSERT INTO t2 VALUES(1); SELECT (SELECT sum(value2==xyz) FROM t2) FROM (SELECT value1 as xyz, max(x1) AS pqr FROM t1 GROUP BY id1); } } {0} do_test aggnested-3.3 { db eval { DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t2; CREATE TABLE t1(id1, value1); INSERT INTO t1 VALUES(4469,2),(4469,1); CREATE TABLE t2 (value2); INSERT INTO t2 VALUES(1); SELECT (SELECT sum(value2=value1) FROM t2), max(value1) FROM t1 GROUP BY id1; } } {0 2} # A batch of queries all doing approximately the same operation involving # two nested aggregate queries. # do_test aggnested-3.11 { db eval { DROP TABLE IF EXISTS t1; DROP TABLE IF EXISTS t2; CREATE TABLE t1(id1, value1); INSERT INTO t1 VALUES(4469,12),(4469,11),(4470,34); CREATE INDEX t1id1 ON t1(id1); CREATE TABLE t2 (value2); INSERT INTO t2 VALUES(12),(34),(34); INSERT INTO t2 SELECT value2 FROM t2; SELECT max(value1), (SELECT count(*) FROM t2 WHERE value2=max(value1)) FROM t1 GROUP BY id1; } } {12 2 34 4} do_test aggnested-3.12 { db eval { SELECT max(value1), (SELECT count(*) FROM t2 WHERE value2=value1) FROM t1 GROUP BY id1; } } {12 2 34 4} do_test aggnested-3.13 { db eval { SELECT value1, (SELECT sum(value2=value1) FROM t2) FROM t1; } } {12 2 11 0 34 4} do_test aggnested-3.14 { db eval { SELECT value1, (SELECT sum(value2=value1) FROM t2) FROM t1 WHERE value1 IN (SELECT max(value1) FROM t1 GROUP BY id1); } } {12 2 34 4} do_test aggnested-3.15 { # FIXME: If case 3.16 works, then this case really ought to work too... catchsql { SELECT max(value1), (SELECT sum(value2=max(value1)) FROM t2) FROM t1 GROUP BY id1; } } {1 {misuse of aggregate function max()}} do_test aggnested-3.16 { db eval { SELECT max(value1), (SELECT sum(value2=value1) FROM t2) FROM t1 GROUP BY id1; } } {12 2 34 4} finish_test |