/ Check-in [5f2539da]
Login

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: 5f2539da8cb9df99029ab4ab7023804722697673
User & Date: drh 2015-05-07 00:09:29
Context
2015-05-07
11:53
Version 3.8.10 check-in: cf975957 user: drh tags: trunk, release, version-3.8.10
00:09
Remove a faulty assert() statement. check-in: 5f2539da user: drh tags: trunk
2015-05-06
14:18
Have the autoconf package build the shell tool with SQLite linked in statically. check-in: 31834c3a user: dan tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/resolve.c.

    95     95     Expr *pOrig;           /* The iCol-th column of the result set */
    96     96     Expr *pDup;            /* Copy of pOrig */
    97     97     sqlite3 *db;           /* The database connection */
    98     98   
    99     99     assert( iCol>=0 && iCol<pEList->nExpr );
   100    100     pOrig = pEList->a[iCol].pExpr;
   101    101     assert( pOrig!=0 );
   102         -  assert( (pOrig->flags & EP_Resolved)!=0 || zType[0]==0 );
   103    102     db = pParse->db;
   104    103     pDup = sqlite3ExprDup(db, pOrig, 0);
   105    104     if( pDup==0 ) return;
   106    105     if( pOrig->op!=TK_COLUMN && zType[0]!='G' ){
   107    106       incrAggFunctionDepth(pDup, nSubquery);
   108    107       pDup = sqlite3PExpr(pParse, TK_AS, pDup, 0, 0);
   109    108       if( pDup==0 ) return;

Changes to test/select4.test.

   154    154   } {1 {ORDER BY clause should come after UNION not before}}
   155    155   do_test select4-2.4 {
   156    156     set v [catch {execsql {
   157    157       SELECT 0 ORDER BY (SELECT 0) UNION SELECT 0;
   158    158     }} msg]
   159    159     lappend v $msg
   160    160   } {1 {ORDER BY clause should come after UNION not before}}
          161  +do_execsql_test select4-2.5 {
          162  +  SELECT 123 AS x ORDER BY (SELECT x ORDER BY 1);
          163  +} {123}
   161    164   
   162    165   # Except operator
   163    166   #
   164    167   do_test select4-3.1.1 {
   165    168     execsql {
   166    169       SELECT DISTINCT log FROM t1
   167    170       EXCEPT