Fix a bug in UPDATE OR REPLACE that was introduced by check-in (999).
Also clean up some compiler warnings for VC++. (CVS 1005)
FossilOrigin-Name: af6f2bdf59fb621ff3e1d061e429f01ebd7d0b42
diff --git a/manifest b/manifest
index 901d643..e559311 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Adjust\stest\scases\sto\scope\swith\sthe\sextra\scolumn\sreturned\sby\sthe\sdatabase_list\npragma.\s(CVS\s1004)
-D 2003-06-04T15:53:02
+C Fix\sa\sbug\sin\sUPDATE\sOR\sREPLACE\sthat\swas\sintroduced\sby\scheck-in\s(999).\nAlso\sclean\sup\ssome\scompiler\swarnings\sfor\sVC++.\s(CVS\s1005)
+D 2003-06-04T16:24:39
F Makefile.in 1ff85c27d4350c74118341024e8a4fb2a04a3a43
F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -21,7 +21,7 @@
F sqlite.pc.in 30552343140c53304c2a658c080fbe810cd09ca2
F src/attach.c db89b086f58b679e3f140296e3b95942989b04ba
F src/auth.c c8f50d4507e37779d96ff3c55417bc2b612dfed6
-F src/btree.c 8092dca45dcdb69c61273db0213cbb85760673c7
+F src/btree.c 6656625305e5e99adda818a772bf7432a7b15d97
F src/btree.h 9b7c09f1e64274d7bb74a57bbfc63778f67b1048
F src/btree_rb.c 7fc5930cdd0df739b5ad7f4d63fd913758caae8a
F src/build.c 936d10b33b326546280690bee7f20efaf19a6fe8
@@ -32,12 +32,12 @@
F src/func.c 33bbce6acaf9578ac99aa1f689968ccaf2ce43a2
F src/hash.c 058f077c1f36f266581aa16f907a3903abf64aa3
F src/hash.h cd0433998bc1a3759d244e1637fe5a3c13b53bf8
-F src/insert.c 6a61c6d1ef17396d0e87e555806653fddab0b084
+F src/insert.c fc4c26a0bb505fb802babfb9a7b7a1d4be2e3061
F src/main.c c785a3d4675b26cde2d69015aa1090d69ff0da43
F src/md5.c fe4f9c9c6f71dfc26af8da63e4d04489b1430565
-F src/os.c 080238f03015057879cdf53bc4af9e497f2ba724
+F src/os.c 4f540b4e5208c8b59e81cdbb8267c8705288b56e
F src/os.h 9e5bbddff123187295e3d00d49af06192cd1cd49
-F src/pager.c 51fdfda63e2d8c01fff8f7fe0c49f2636d5b1321
+F src/pager.c c4d007fc3572950d9ee20cae03c2beb4e4c12daa
F src/pager.h 5da62c83443f26b1792cfd72c96c422f91aadd31
F src/parse.y 917250e5d86bdee752355e6617ea2e8ee12438bf
F src/pragma.c f439a6157fe7c8d66dc2c6bfde2abaf23e770e1d
@@ -59,7 +59,7 @@
F src/update.c 24260b4fda00c9726d27699a0561d53c0dccc397
F src/util.c 18d16fa3171e34b6f6f73ef0c61e7d9b73b78826
F src/vacuum.c 0820984615786c9ccdaad8032a792309b354a8eb
-F src/vdbe.c 4170cba0a05da0a93dcd674859fc1ce18f3fb0a3
+F src/vdbe.c 5602825b5f71496963997985de773ad4750eba65
F src/vdbe.h 985c24f312d10f9ef8f9a8b8ea62fcdf68e82f21
F src/where.c 1e645d430cb4b347159c28c6085e9801160f2099
F test/all.test 569a92a8ee88f5300c057cc4a8f50fbbc69a3242
@@ -83,7 +83,7 @@
F test/func.test 000515779001ac6899eec4b54e65c6e2501279d4
F test/in.test 22de8a3eb27265aab723adc513bea0e76bef70c6
F test/index.test 90ef4c426865f15937858bd433cc82b9c11af913
-F test/insert.test e73709f2fee30e003ce131e7ca66ad3dcfac662a
+F test/insert.test 8902df72b309164e4b99694aed3e12c2e37516ab
F test/insert2.test c288375a64dad3295044714f0dfed4a193cf067f
F test/intpkey.test 39f49fd993350f7f3ab255e5cfbf9a09d8f8800e
F test/ioerr.test 5dbaf09f96b56ee01cf3edd762b96eb4ad2c9ca4
@@ -165,7 +165,7 @@
F www/sqlite.tcl 4bd1729e320f5fa9125f0022b281fbe839192125
F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
-P f39100f5759d0d8b9c71e18d38a148dee4643020
-R e73d3888fde77757fd3cbb21c9a30175
+P fa10c6df5a80127508fb198c21ef93acfc93ebe2
+R 94482faf4cbad2ee70a44fe5ffdac4f3
U drh
-Z 4c41b5d59b8d9ed613fa16ca0602fcaf
+Z 13ad783eb6736db498d85a49fe1b10fe
diff --git a/manifest.uuid b/manifest.uuid
index 3c26bc8..af8f2f1 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-fa10c6df5a80127508fb198c21ef93acfc93ebe2
\ No newline at end of file
+af6f2bdf59fb621ff3e1d061e429f01ebd7d0b42
\ No newline at end of file
diff --git a/src/btree.c b/src/btree.c
index a7936e9..c1bd51a 100644
--- a/src/btree.c
+++ b/src/btree.c
@@ -9,7 +9,7 @@
** May you share freely, never taking more than you give.
**
*************************************************************************
-** $Id: btree.c,v 1.93 2003/05/17 17:35:11 drh Exp $
+** $Id: btree.c,v 1.94 2003/06/04 16:24:39 drh Exp $
**
** This file implements a external (disk-based) database using BTrees.
** For a detailed discussion of BTrees, refer to
@@ -2477,7 +2477,7 @@
int minV = pgnoNew[i];
int minI = i;
for(j=i+1; j<k; j++){
- if( pgnoNew[j]<minV ){
+ if( pgnoNew[j]<(unsigned)minV ){
minI = j;
minV = pgnoNew[j];
}
diff --git a/src/insert.c b/src/insert.c
index 98fc76c..7c2b611 100644
--- a/src/insert.c
+++ b/src/insert.c
@@ -12,7 +12,7 @@
** This file contains C code routines that are called by the parser
** to handle INSERT statements in SQLite.
**
-** $Id: insert.c,v 1.87 2003/06/04 12:23:31 drh Exp $
+** $Id: insert.c,v 1.88 2003/06/04 16:24:39 drh Exp $
*/
#include "sqliteInt.h"
@@ -748,7 +748,7 @@
case OE_Replace: {
sqliteGenerateRowIndexDelete(pParse->db, v, pTab, base, 0);
if( isUpdate ){
- sqliteVdbeAddOp(v, OP_Dup, nCol+extra+1+hasTwoRecnos, 1);
+ sqliteVdbeAddOp(v, OP_Dup, nCol+hasTwoRecnos, 1);
sqliteVdbeAddOp(v, OP_MoveTo, base, 0);
}
seenReplace = 1;
diff --git a/src/os.c b/src/os.c
index 2193b64..d9d16ed 100644
--- a/src/os.c
+++ b/src/os.c
@@ -1003,7 +1003,6 @@
int isNT(void){
static osType = 0; /* 0=unknown 1=win95 2=winNT */
if( osType==0 ){
- int tmpOsType;
OSVERSIONINFO sInfo;
sInfo.dwOSVersionInfoSize = sizeof(sInfo);
GetVersionEx(&sInfo);
diff --git a/src/pager.c b/src/pager.c
index 130043d..51c7590 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -18,7 +18,7 @@
** file simultaneously, or one process from reading the database while
** another is writing.
**
-** @(#) $Id: pager.c,v 1.83 2003/04/25 15:37:58 drh Exp $
+** @(#) $Id: pager.c,v 1.84 2003/06/04 16:24:40 drh Exp $
*/
#include "os.h" /* Must be first to enable large file support */
#include "sqliteInt.h"
@@ -496,7 +496,7 @@
if( pgRec.pgno==0 ){
return SQLITE_DONE;
}
- if( pgRec.pgno>pPager->dbSize ){
+ if( pgRec.pgno>(unsigned)pPager->dbSize ){
return SQLITE_OK;
}
if( format>=JOURNAL_FORMAT_3 ){
@@ -944,7 +944,7 @@
rc = pager_errcode(pPager);
return rc;
}
- if( nPage>=pPager->dbSize ){
+ if( nPage>=(unsigned)pPager->dbSize ){
return SQLITE_OK;
}
syncAllPages(pPager);
diff --git a/src/vdbe.c b/src/vdbe.c
index 0a66218..1491c77 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -36,7 +36,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.225 2003/06/02 23:14:13 drh Exp $
+** $Id: vdbe.c,v 1.226 2003/06/04 16:24:40 drh Exp $
*/
#include "sqliteInt.h"
#include <ctype.h>
@@ -2287,7 +2287,7 @@
/* Do nothing */
}else if( aStack[tos].flags & STK_Real ){
int i = aStack[tos].r;
- double r = i;
+ double r = (double)i;
if( r!=aStack[tos].r ){
goto mismatch;
}
diff --git a/test/insert.test b/test/insert.test
index 4dbe191..4fe4ec4 100644
--- a/test/insert.test
+++ b/test/insert.test
@@ -11,7 +11,7 @@
# This file implements regression tests for SQLite library. The
# focus of this file is testing the INSERT statement.
#
-# $Id: insert.test,v 1.13 2003/06/04 12:23:32 drh Exp $
+# $Id: insert.test,v 1.14 2003/06/04 16:24:40 drh Exp $
set testdir [file dirname $argv0]
source $testdir/tester.tcl
@@ -269,5 +269,16 @@
SELECT b FROM t1 WHERE b=2;
}
} {}
+do_test insert-6.3 {
+ execsql {
+ UPDATE OR REPLACE t1 SET a=2 WHERE b=4;
+ SELECT * FROM t1 WHERE b=4;
+ }
+} {2 4}
+do_test insert-6.4 {
+ execsql {
+ SELECT * FROM t1 WHERE b=3;
+ }
+} {}
finish_test