/ Check-in [c95823cd]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Remove an ALWAYS() that is no longer always true.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | common-table-expr
Files: files | file ages | folders
SHA1: c95823cd451f7721174393817a801403647467db
User & Date: drh 2014-01-15 20:10:15
Context
2014-01-16
04:37
Merge trunk changes. Fix a possible NULL-pointer deference in WITH clause name resolution. check-in: 7f953b56 user: drh tags: common-table-expr
2014-01-15
20:10
Remove an ALWAYS() that is no longer always true. check-in: c95823cd user: drh tags: common-table-expr
19:42
Fixes so that SQLITE_OMIT_CTE builds work. check-in: 3908e2ea user: dan tags: common-table-expr
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/select.c.

  1213   1213             NameContext sNC;
  1214   1214             Expr *p = pS->pEList->a[iCol].pExpr;
  1215   1215             sNC.pSrcList = pS->pSrc;
  1216   1216             sNC.pNext = pNC;
  1217   1217             sNC.pParse = pNC->pParse;
  1218   1218             zType = columnType(&sNC, p,&zOrigDb,&zOrigTab,&zOrigCol, &estWidth); 
  1219   1219           }
  1220         -      }else if( ALWAYS(pTab->pSchema) ){
         1220  +      }else if( pTab->pSchema ){
  1221   1221           /* A real table */
  1222   1222           assert( !pS );
  1223   1223           if( iCol<0 ) iCol = pTab->iPKey;
  1224   1224           assert( iCol==-1 || (iCol>=0 && iCol<pTab->nCol) );
  1225   1225   #ifdef SQLITE_ENABLE_COLUMN_METADATA
  1226   1226           if( iCol<0 ){
  1227   1227             zType = "INTEGER";