1
0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-08 03:22:21 +03:00

Most sorting problems are fixed. Dead code has been removed. 3 test failures

remain but will be fixed by the new function API once it gets implemented. (CVS 1425)

FossilOrigin-Name: 3b55095e036d68886d007239333bbf90acd15692
This commit is contained in:
drh
2004-05-21 02:14:24 +00:00
parent 2f2322fa9c
commit 736c22b803
9 changed files with 64 additions and 132 deletions

View File

@@ -12,7 +12,7 @@
** This file contains routines used for analyzing expressions and
** for generating VDBE code that evaluates expressions in SQLite.
**
** $Id: expr.c,v 1.125 2004/05/20 22:16:29 drh Exp $
** $Id: expr.c,v 1.126 2004/05/21 02:14:25 drh Exp $
*/
#include "sqliteInt.h"
#include <ctype.h>
@@ -1039,12 +1039,14 @@ int sqlite3ExprType(Expr *p){
if( p==0 ) return SQLITE_AFF_NONE;
while( p ) switch( p->op ){
case TK_CONCAT:
case TK_STRING:
return SQLITE_AFF_TEXT;
case TK_AS:
p = p->pLeft;
break;
case TK_VARIABLE:
case TK_NULL:
return SQLITE_AFF_NONE;