From bb50e7ad764d526fe73fc64b9deca15e870e5ba0 Mon Sep 17 00:00:00 2001
From: danielk1977 <danielk1977@noemail.net>
Date: Fri, 4 Jul 2008 10:56:07 +0000
Subject: [PATCH] Fix for explicitly inserting a NULL value into the rowid
 column of a virtual table. (CVS 5343)

FossilOrigin-Name: a7f3b431669f7392a6acba8cd8f3fa5297a916b5
---
 manifest          | 16 ++++++++--------
 manifest.uuid     |  2 +-
 src/insert.c      | 15 ++++++++++-----
 test/tkt3201.test |  4 ++--
 test/vtab1.test   | 27 ++++++++++++++++++++++++++-
 5 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/manifest b/manifest
index 2a8bdea212..8f0b79035d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sredundant\scode\sfrom\ssqlite3GetTempReg().\s(CVS\s5342)
-D 2008-07-04T09:41:39
+C Fix\sfor\sexplicitly\sinserting\sa\sNULL\svalue\sinto\sthe\srowid\scolumn\sof\sa\svirtual\stable.\s(CVS\s5343)
+D 2008-07-04T10:56:08
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 325dfac0a0dd1cb4d975f1ace6453157892e6042
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -110,7 +110,7 @@ F src/global.c 2304cfa3288763bd2fed10caf8c6fbaa2b383f4e
 F src/hash.c eb64e48f3781100e5934f759fbe72a63a8fe78cb
 F src/hash.h 031cd9f915aff27e12262cb9eb570ac1b8326b53
 F src/hwtime.h 745961687a65ef8918cd551c02e5ccb4b8e772de
-F src/insert.c f8c7da31409ec19a769b960a4a2b9cca7bab80bd
+F src/insert.c 9af927a81fdc99624130dc83722b3ab6364035a6
 F src/journal.c cffd2cd214e58c0e99c3ff632b3bee6c7cbb260e
 F src/legacy.c 3626c71fb70912abec9a4312beba753a9ce800df
 F src/loadext.c 40024a0f476c1279494876b9a002001b29e5d3e3
@@ -526,7 +526,7 @@ F test/tkt2942.test c5c87d179799ca6d1fbe83c815510b87cd5ec7ce
 F test/tkt3080.test 31a02e87a4c80ed443831c2c5b0e8216ff95ac14
 F test/tkt3093.test fbdbc5b4969244ad11f540759003e361fcaf391f
 F test/tkt3121.test 9da9c57b75c9dbebae70eb19f458bbc616d04280
-F test/tkt3201.test f2a40b04bb769087b88acca9a17f5874254698f6
+F test/tkt3201.test 5b16303169c2262d78586679ae8884337e5fc9a8
 F test/trace.test 951cd0f5f571e7f36bf7bfe04be70f90fb16fb00
 F test/trans.test 2fd24cd7aa0b879d49a224cbd647d698f1e7ac5c
 F test/trigger1.test 7c13f39ca36f529bf856e05c7d004fc0531d48b4
@@ -552,7 +552,7 @@ F test/vacuum3.test 6149b24613f487915ca9cedfbb9147d5759714ec
 F test/varint.test ab7b110089a08b9926ed7390e7e97bdefeb74102
 F test/veryquick.test fdd8108de66eec378291d9a0e46e30d129eef1ca
 F test/view.test 041ccaf4c96f6c90d564c9ea37d1c1fa21fdb470
-F test/vtab1.test 47092e3ac59141f08e09a6c0cc0df8997242bc79
+F test/vtab1.test 4421276b9010022d623879531a05a58fefaad771
 F test/vtab2.test 1da49b015582965a8fc386aa23d051a5a622b08e
 F test/vtab3.test f38d6d7d19f08bffdadce4d5b8cba078f8118587
 F test/vtab4.test a9d7104d41a787754a734740d7aa61c807a69f87
@@ -598,7 +598,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 1dbced29de5f59ba2ebf877edcadf171540374d1
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P f099d6773a837dbe4ba85a8fda818e2d9466e743
-R 50f400c9772d85c2c24551ddc1a0402e
+P 212d05d38c8126f99c028c5ab021b219487fa01e
+R 05b4445ad462e1bc7a4f23619c79cabb
 U danielk1977
-Z 7224db38772dcdb44aa2d3e38e2dec82
+Z ef13a447ae3cb8c8f3ec0022bfd3fe35
diff --git a/manifest.uuid b/manifest.uuid
index bdd923036f..94909c48ac 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-212d05d38c8126f99c028c5ab021b219487fa01e
\ No newline at end of file
+a7f3b431669f7392a6acba8cd8f3fa5297a916b5
\ No newline at end of file
diff --git a/src/insert.c b/src/insert.c
index 267110a16e..afb391473f 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.243 2008/06/24 12:46:31 drh Exp $
+** $Id: insert.c,v 1.244 2008/07/04 10:56:08 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 
@@ -836,7 +836,7 @@ void sqlite3Insert(
         VdbeOp *pOp;
         sqlite3ExprCode(pParse, pList->a[keyColumn].pExpr, regRowid);
         pOp = sqlite3VdbeGetOp(v, sqlite3VdbeCurrentAddr(v) - 1);
-        if( pOp && pOp->opcode==OP_Null ){
+        if( pOp && pOp->opcode==OP_Null && !IsVirtual(pTab) ){
           appendFlag = 1;
           pOp->opcode = OP_NewRowid;
           pOp->p1 = baseCur;
@@ -849,9 +849,14 @@ void sqlite3Insert(
       */
       if( !appendFlag ){
         int j1;
-        j1 = sqlite3VdbeAddOp1(v, OP_NotNull, regRowid);
-        sqlite3VdbeAddOp3(v, OP_NewRowid, baseCur, regRowid, regAutoinc);
-        sqlite3VdbeJumpHere(v, j1);
+        if( !IsVirtual(pTab) ){
+          j1 = sqlite3VdbeAddOp1(v, OP_NotNull, regRowid);
+          sqlite3VdbeAddOp3(v, OP_NewRowid, baseCur, regRowid, regAutoinc);
+          sqlite3VdbeJumpHere(v, j1);
+        }else{
+          j1 = sqlite3VdbeCurrentAddr(v);
+          sqlite3VdbeAddOp2(v, OP_IsNull, regRowid, j1+2);
+        }
         sqlite3VdbeAddOp1(v, OP_MustBeInt, regRowid);
       }
     }else if( IsVirtual(pTab) ){
diff --git a/test/tkt3201.test b/test/tkt3201.test
index a388ff703b..5576834803 100644
--- a/test/tkt3201.test
+++ b/test/tkt3201.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library. 
 # Specifically, it tests that bug #3201 has been fixed.
 #
-# $Id: tkt3201.test,v 1.1 2008/07/04 09:15:11 danielk1977 Exp $
+# $Id: tkt3201.test,v 1.2 2008/07/04 10:56:08 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -67,10 +67,10 @@ do_test tkt3201-6 {
 } {1 one 2 two}
 
 do_test tkt3201-7 {
-  explain { SELECT a, b, c, d FROM t1, t3 WHERE a < c }
   execsql { SELECT a, b, c, d FROM t1, t3 WHERE a < c }
 } {1 one 2 two}
 
+
 finish_test
 
 
diff --git a/test/vtab1.test b/test/vtab1.test
index 625928d98f..a5af7bf662 100644
--- a/test/vtab1.test
+++ b/test/vtab1.test
@@ -11,7 +11,7 @@
 # This file implements regression tests for SQLite library.  The
 # focus of this file is creating and dropping virtual tables.
 #
-# $Id: vtab1.test,v 1.53 2008/06/16 06:31:35 danielk1977 Exp $
+# $Id: vtab1.test,v 1.54 2008/07/04 10:56:08 danielk1977 Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -1081,5 +1081,30 @@ do_test vtab1-14.4 {
   set echo_module
 } [list xBestIndex {SELECT rowid, * FROM 'c'} xFilter {SELECT rowid, * FROM 'c'}]
 
+do_test vtab1-15.1 {
+  execsql {
+    CREATE TABLE t1(a, b, c);
+    CREATE VIRTUAL TABLE echo_t1 USING echo(t1);
+  }
+} {}
+do_test vtab1-15.2 {
+  execsql {
+    INSERT INTO echo_t1(rowid) VALUES(45);
+    SELECT rowid, * FROM echo_t1;
+  }
+} {45 {} {} {}}
+do_test vtab1-15.3 {
+  execsql {
+    INSERT INTO echo_t1(rowid) VALUES(NULL);
+    SELECT rowid, * FROM echo_t1;
+  }
+} {45 {} {} {} 46 {} {} {}}
+do_test vtab1-15.4 {
+  catchsql {
+    INSERT INTO echo_t1(rowid) VALUES('new rowid');
+  }
+} {1 {datatype mismatch}}
+
+
 unset -nocomplain echo_module_begin_fail
 finish_test