database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-12-07 20:22:20 +03:00
Code Activity

Use the SQLITE_UTF* symbols instead of the old internal TEXT_Utf* symbols. (CVS 1572)

Browse Source 
FossilOrigin-Name: 9b84f2f488e1d37ba1a4c4cf31490bcbba0f6edd
This commit is contained in:
danielk1977
2004-06-12 00:42:34 +00:00
parent 31ef3b91f5
commit dc8453fd7a
18 changed files with 143 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/build.c
View File

@@ -23,7 +23,7 @@
** ROLLBACK
** PRAGMA
**
** $Id: build.c,v 1.216 2004/06/10 14:01:08 danielk1977 Exp $
** $Id: build.c,v 1.217 2004/06/12 00:42:35 danielk1977 Exp $
*/
#include "sqliteInt.h"
#include <ctype.h>
@@ -879,11 +879,11 @@ static CollSeq * findCollSeqEntry(
pColl = sqliteMalloc( 3*sizeof(*pColl) + nName + 1 );
if( pColl ){
pColl[0].zName = (char*)&pColl[3];
pColl[0].enc = TEXT_Utf8;
pColl[0].enc = SQLITE_UTF8;
pColl[1].zName = (char*)&pColl[3];
pColl[1].enc = TEXT_Utf16le;
pColl[1].enc = SQLITE_UTF16LE;
pColl[2].zName = (char*)&pColl[3];
pColl[2].enc = TEXT_Utf16be;
pColl[2].enc = SQLITE_UTF16BE;
memcpy(pColl[0].zName, zName, nName);
pColl[0].zName[nName] = 0;
sqlite3HashInsert(&db->aCollSeq, pColl[0].zName, nName, pColl);
@@ -909,12 +909,12 @@ CollSeq *sqlite3FindCollSeq(
){
CollSeq *pColl = findCollSeqEntry(db, zName, nName, create);
if( pColl ) switch( enc ){
case TEXT_Utf8:
case SQLITE_UTF8:
break;
case TEXT_Utf16le:
case SQLITE_UTF16LE:
pColl = &pColl[1];
break;
case TEXT_Utf16be:
case SQLITE_UTF16BE:
pColl = &pColl[2];
break;
default:
@@ -957,27 +957,27 @@ static int synthCollSeq(Parse *pParse, CollSeq *pColl){
char *z = pColl->zName;
int n = strlen(z);
switch( pParse->db->enc ){
case TEXT_Utf16le:
pColl2 = sqlite3FindCollSeq(pParse->db, TEXT_Utf16be, z, n, 0);
case SQLITE_UTF16LE:
pColl2 = sqlite3FindCollSeq(pParse->db, SQLITE_UTF16BE, z, n, 0);
assert( pColl2 );
if( pColl2->xCmp ) break;
pColl2 = sqlite3FindCollSeq(pParse->db, TEXT_Utf8, z, n, 0);
pColl2 = sqlite3FindCollSeq(pParse->db, SQLITE_UTF8, z, n, 0);
assert( pColl2 );
break;
case TEXT_Utf16be:
pColl2 = sqlite3FindCollSeq(pParse->db,TEXT_Utf16le, z, n, 0);
case SQLITE_UTF16BE:
pColl2 = sqlite3FindCollSeq(pParse->db,SQLITE_UTF16LE, z, n, 0);
assert( pColl2 );
if( pColl2->xCmp ) break;
pColl2 = sqlite3FindCollSeq(pParse->db,TEXT_Utf8, z, n, 0);
pColl2 = sqlite3FindCollSeq(pParse->db,SQLITE_UTF8, z, n, 0);
assert( pColl2 );
break;
case TEXT_Utf8:
pColl2 = sqlite3FindCollSeq(pParse->db,TEXT_Utf16be, z, n, 0);
case SQLITE_UTF8:
pColl2 = sqlite3FindCollSeq(pParse->db,SQLITE_UTF16BE, z, n, 0);
assert( pColl2 );
if( pColl2->xCmp ) break;
pColl2 = sqlite3FindCollSeq(pParse->db,TEXT_Utf16le, z, n, 0);
pColl2 = sqlite3FindCollSeq(pParse->db,SQLITE_UTF16LE, z, n, 0);
assert( pColl2 );
break;
}