commit dc1bdc4f9df43440a55f582763144b8c06c74b48
author danielk1977 <danielk1977@noemail.net> Fri Jun 11 10:51:27 2004 +0000
committer danielk1977 <danielk1977@noemail.net> Fri Jun 11 10:51:27 2004 +0000
tree ad10d03cae7d226a76716c53ccce2111fc20be4f
parent 726de599bd2f23bb56ef5bb61204891a5c454537

Fix various collation sequence issues. (CVS 1568)

FossilOrigin-Name: 66835ee67051027456a536e33b2f88a741654525

src/expr.c

diff --git a/src/expr.c b/src/expr.c
index 762b696..7b4768f 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -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.138 2004/06/10 10:50:17 danielk1977 Exp $
+** $Id: expr.c,v 1.139 2004/06/11 10:51:27 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -386,6 +386,7 @@
   pNew->zSelect = 0;
   pNew->iLimit = -1;
   pNew->iOffset = -1;
+  pNew->ppOpenTemp = 0;
   return pNew;
 }
 
@@ -1280,6 +1281,7 @@
       int p2 = 0;
       int i;
       int iPrefEnc = (pParse->db->enc==TEXT_Utf8)?0:1;
+      CollSeq *pColl = 0;
       getFunctionName(pExpr, &zId, &nId);
       pDef = sqlite3FindFunction(pParse->db, zId, nId, nExpr, iPrefEnc, 0);
       assert( pDef!=0 );
@@ -1288,6 +1290,13 @@
         if( sqlite3ExprIsConstant(pList->a[i].pExpr) ){
           p2 |= (1<<i);
         }
+        if( pDef->needCollSeq && !pColl ){
+          pColl = sqlite3ExprCollSeq(pParse, pList->a[i].pExpr);
+        }
+      }
+      if( pDef->needCollSeq ){
+        if( !pColl ) pColl = pParse->db->pDfltColl; 
+        sqlite3VdbeOp3(v, OP_CollSeq, 0, 0, pColl, P3_COLLSEQ);
       }
       sqlite3VdbeOp3(v, OP_Function, nExpr, p2, (char*)pDef, P3_FUNCDEF);
       break;