database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +03:00
Code Activity

Add a temporary sqlite2BtreeKeyCompare() function to help get

Browse Source 
regression tests passing again. (CVS 1332)

FossilOrigin-Name: d8d1c91e55f24d17233414facaa03136b3b320d5
This commit is contained in:
danielk1977
2004-05-09 23:23:56 +00:00
parent 3a4c141357
commit 189621d81f
6 changed files with 60 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/vdbe.c
View File

@@ -43,7 +43,7 @@
** in this file for details. If in doubt, do not deviate from existing
** commenting and indentation practices when changing or adding code.
**
** $Id: vdbe.c,v 1.270 2004/05/08 10:56:12 drh Exp $
** $Id: vdbe.c,v 1.271 2004/05/09 23:23:58 danielk1977 Exp $
*/
#include "sqliteInt.h"
#include "os.h"
@@ -2744,9 +2744,8 @@ case OP_IsUnique: {
break;
}
}
/******** FIX ME
rc = sqlite3BtreeKeyCompare(pCrsr, zKey, nKey-4, 4, &res);
*/rc=SQLITE_INTERNAL;
/* FIX ME - the sqlite2BtreeKeyCompare() function is a temporary hack */
rc = sqlite2BtreeKeyCompare(pCrsr, zKey, nKey-4, 4, &res);
if( rc!=SQLITE_OK ) goto abort_due_to_error;
if( res>0 ){
pc = pOp->p2 - 1;
@@ -3474,9 +3473,8 @@ case OP_IdxPut: {
int c;
/* TODO: sqlite3BtreeKeySize(pCrsr, &n); */
if( n==nKey
/***** FIX ME
&& sqlite3BtreeKeyCompare(pCrsr, zKey, nKey-4, 4, &c)==SQLITE_OK
*/
/* FIX ME - the sqlite2BtreeKeyCompare() function is a temporary hack */
&& sqlite2BtreeKeyCompare(pCrsr, zKey, nKey-4, 4, &c)==SQLITE_OK
&& c==0
){
rc = SQLITE_CONSTRAINT;
@@ -3597,9 +3595,8 @@ case OP_IdxGE: {
Stringify(pTos);
assert( p->aCsr[i].deferredMoveto==0 );
/****** FIX ME
rc = sqlite3BtreeKeyCompare(pCrsr, pTos->z, pTos->n, 4, &res);
*/rc=SQLITE_INTERNAL;
/* FIX ME - the sqlite2BtreeKeyCompare() function is a temporary hack */
rc = sqlite2BtreeKeyCompare(pCrsr, pTos->z, pTos->n, 4, &res);
if( rc!=SQLITE_OK ){
break;
}