Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Remove a faulty assert() statement. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
5f2539da8cb9df99029ab4ab70238047 |
| User & Date: | drh 2015-05-07 00:09:29 |
Context
|
2015-05-07
| ||
| 11:53 | Version 3.8.10 check-in: cf975957b9 user: drh tags: trunk, release, version-3.8.10 | |
| 00:09 | Remove a faulty assert() statement. check-in: 5f2539da8c user: drh tags: trunk | |
|
2015-05-06
| ||
| 14:18 | Have the autoconf package build the shell tool with SQLite linked in statically. check-in: 31834c3aa7 user: dan tags: trunk | |
Changes
Changes to src/resolve.c.
95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 |
Expr *pOrig; /* The iCol-th column of the result set */
Expr *pDup; /* Copy of pOrig */
sqlite3 *db; /* The database connection */
assert( iCol>=0 && iCol<pEList->nExpr );
pOrig = pEList->a[iCol].pExpr;
assert( pOrig!=0 );
assert( (pOrig->flags & EP_Resolved)!=0 || zType[0]==0 );
db = pParse->db;
pDup = sqlite3ExprDup(db, pOrig, 0);
if( pDup==0 ) return;
if( pOrig->op!=TK_COLUMN && zType[0]!='G' ){
incrAggFunctionDepth(pDup, nSubquery);
pDup = sqlite3PExpr(pParse, TK_AS, pDup, 0, 0);
if( pDup==0 ) return;
|
< |
95 96 97 98 99 100 101 102 103 104 105 106 107 108 |
Expr *pOrig; /* The iCol-th column of the result set */
Expr *pDup; /* Copy of pOrig */
sqlite3 *db; /* The database connection */
assert( iCol>=0 && iCol<pEList->nExpr );
pOrig = pEList->a[iCol].pExpr;
assert( pOrig!=0 );
db = pParse->db;
pDup = sqlite3ExprDup(db, pOrig, 0);
if( pDup==0 ) return;
if( pOrig->op!=TK_COLUMN && zType[0]!='G' ){
incrAggFunctionDepth(pDup, nSubquery);
pDup = sqlite3PExpr(pParse, TK_AS, pDup, 0, 0);
if( pDup==0 ) return;
|
Changes to test/select4.test.
154 155 156 157 158 159 160 161 162 163 164 165 166 167 |
} {1 {ORDER BY clause should come after UNION not before}}
do_test select4-2.4 {
set v [catch {execsql {
SELECT 0 ORDER BY (SELECT 0) UNION SELECT 0;
}} msg]
lappend v $msg
} {1 {ORDER BY clause should come after UNION not before}}
# Except operator
#
do_test select4-3.1.1 {
execsql {
SELECT DISTINCT log FROM t1
EXCEPT
|
> > > |
154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 |
} {1 {ORDER BY clause should come after UNION not before}}
do_test select4-2.4 {
set v [catch {execsql {
SELECT 0 ORDER BY (SELECT 0) UNION SELECT 0;
}} msg]
lappend v $msg
} {1 {ORDER BY clause should come after UNION not before}}
do_execsql_test select4-2.5 {
SELECT 123 AS x ORDER BY (SELECT x ORDER BY 1);
} {123}
# Except operator
#
do_test select4-3.1.1 {
execsql {
SELECT DISTINCT log FROM t1
EXCEPT
|