diff options
| author | danielk1977 <danielk1977@noemail.net> | 2004-06-12 00:42:34 +0000 |
|---|---|---|
| committer | danielk1977 <danielk1977@noemail.net> | 2004-06-12 00:42:34 +0000 |
| commit | dc8453fd7acab7acdcbf68c5ef13717e8e8e6587 (patch) | |
| tree | 436986e86229244aabe55d179964b79b92f5ff3a /src/expr.c | |
| parent | 31ef3b91f5009f184e209ca7ddc4b009f59ecc56 (diff) | |
| download | sqlite-dc8453fd7acab7acdcbf68c5ef13717e8e8e6587.tar.gz sqlite-dc8453fd7acab7acdcbf68c5ef13717e8e8e6587.zip | |
Use the SQLITE_UTF* symbols instead of the old internal TEXT_Utf* symbols. (CVS 1572)
FossilOrigin-Name: 9b84f2f488e1d37ba1a4c4cf31490bcbba0f6edd
Diffstat (limited to 'src/expr.c')
| -rw-r--r-- | src/expr.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/expr.c b/src/expr.c index 7b4768f9a..4c80f4400 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.139 2004/06/11 10:51:27 danielk1977 Exp $ +** $Id: expr.c,v 1.140 2004/06/12 00:42:35 danielk1977 Exp $ */ #include "sqliteInt.h" #include <ctype.h> @@ -1012,7 +1012,7 @@ int sqlite3ExprCheck(Parse *pParse, Expr *pExpr, int allowAgg, int *pIsAgg){ int nId; /* Number of characters in function name */ const char *zId; /* The function name. */ FuncDef *pDef; - int iPrefEnc = (pParse->db->enc==TEXT_Utf8)?0:1; + int iPrefEnc = (pParse->db->enc==SQLITE_UTF8)?0:1; getFunctionName(pExpr, &zId, &nId); pDef = sqlite3FindFunction(pParse->db, zId, nId, n, iPrefEnc, 0); @@ -1280,7 +1280,7 @@ void sqlite3ExprCode(Parse *pParse, Expr *pExpr){ const char *zId; int p2 = 0; int i; - int iPrefEnc = (pParse->db->enc==TEXT_Utf8)?0:1; + int iPrefEnc = (pParse->db->enc==SQLITE_UTF8)?0:1; CollSeq *pColl = 0; getFunctionName(pExpr, &zId, &nId); pDef = sqlite3FindFunction(pParse->db, zId, nId, nExpr, iPrefEnc, 0); @@ -1724,7 +1724,7 @@ int sqlite3ExprAnalyzeAggregates(Parse *pParse, Expr *pExpr){ } } if( i>=pParse->nAgg ){ - int iPrefEnc = (pParse->db->enc==TEXT_Utf8)?0:1; + int iPrefEnc = (pParse->db->enc==SQLITE_UTF8)?0:1; i = appendAggInfo(pParse); if( i<0 ) return 1; pParse->aAgg[i].isAgg = 1; |