SQLite: Check-in [8c3929bd]

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

Overview

Comment:	Remove an incorrect and pointless assert().
Downloads:	Tarball \| ZIP archive \| SQL archive
Timelines:	family \| ancestors \| descendants \| both \| trunk
Files:	files \| file ages \| folders
SHA1:	8c3929bd42ff9c041df341aced5b7dbc0f563506
User & Date:	drh 2015-05-25 09:33:48

Context

2015-05-25
10:29		Fix an obsolete comment - no changes to code. check-in: 4e4228c4 user: drh tags: trunk
09:33		Remove an incorrect and pointless assert(). check-in: 8c3929bd user: drh tags: trunk
2015-05-24
21:46		The assert() changes removed in the previous check-in are needed after all. check-in: 336fccc8 user: drh tags: trunk

Changes

Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to src/select.c.

  4232   4232       */
  4233   4233       struct ExprList_item *a = pEList->a;
  4234   4234       ExprList *pNew = 0;
  4235   4235       int flags = pParse->db->flags;
  4236   4236       int longNames = (flags & SQLITE_FullColNames)!=0
  4237   4237                         && (flags & SQLITE_ShortColNames)==0;
  4238   4238   
  4239         -    /* When processing FROM-clause subqueries, it is always the case
  4240         -    ** that full_column_names=OFF and short_column_names=ON.  The
  4241         -    ** sqlite3ResultSetOfSelect() routine makes it so. */
  4242         -    assert( (p->selFlags & SF_NestedFrom)==0
  4243         -          || ((flags & SQLITE_FullColNames)==0 &&
  4244         -              (flags & SQLITE_ShortColNames)!=0) );
  4245         -
  4246   4239       for(k=0; k<pEList->nExpr; k++){
  4247   4240         pE = a[k].pExpr;
  4248   4241         pRight = pE->pRight;
  4249   4242         assert( pE->op!=TK_DOT || pRight!=0 );
  4250   4243         if( pE->op!=TK_ALL && (pE->op!=TK_DOT || pRight->op!=TK_ALL) ){
  4251   4244           /* This particular expression does not need to be expanded.
  4252   4245           */