When the right table in a LEFT OUTER JOIN contains an INTEGER PRIMARY KEY

make sure that key is NULL if there is no row in the right table that
matches the current row in the left table.  Tickets #246 and #247. (CVS 873)

FossilOrigin-Name: 6a45fe3bd7e19cf9c20fc6cb65b0269cdd704490

diff --git a/manifest b/manifest
index c1d41288e6ee218bc4a9898a8c63e12f5b9e9cd5..ded2b2ed930a015ce0c33a7bf8a6b054886117df 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sparsing\sof\sthe\sLIMIT\sclause\swhen\sthe\slimit\sand\soffset\sare\sseparated\nby\sa\scomma.\s\sThe\soffset\scomes\sbefore\sthe\slimit\sin\sthat\scase.\sTicket\s#245.\s(CVS\s872)
-D 2003-02-20T00:44:52
+C When\sthe\sright\stable\sin\sa\sLEFT\sOUTER\sJOIN\scontains\san\sINTEGER\sPRIMARY\sKEY\nmake\ssure\sthat\skey\sis\sNULL\sif\sthere\sis\sno\srow\sin\sthe\sright\stable\sthat\nmatches\sthe\scurrent\srow\sin\sthe\sleft\stable.\s\sTickets\s#246\sand\s#247.\s(CVS\s873)
+D 2003-02-20T01:48:13
 F Makefile.in 6606854b1512f185b8e8c779b8d7fc2750463d64
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -53,7 +53,7 @@ F src/tokenize.c bc40937d6666f188037aa3e54f0a2661a6fef6d1
 F src/trigger.c da142decd2808bc39e801f3bb1f161dbc2bd4005
 F src/update.c f06afa9bf1f777d17702e0f6e33cf44c44bc4f75
 F src/util.c 73b668d1ed468df650dc00685a5e4ffa6887feb4
-F src/vdbe.c fc4c23e41935f14d446dcc74bda2a8f6288cda76
+F src/vdbe.c 4906e666ffbe49e6d9aa03b9ef43cad8213d3a85
 F src/vdbe.h ed43771f1dc2b994d5c484fdf2eab357c6ef0ee3
 F src/where.c ba96cab1fb076f025b6eae3fb0aead769fd2c96f
 F test/all.test 569a92a8ee88f5300c057cc4a8f50fbbc69a3242
@@ -78,7 +78,7 @@ F test/insert.test a122afb86911e77c181d912348866a5b1a61eeab
 F test/insert2.test c288375a64dad3295044714f0dfed4a193cf067f
 F test/intpkey.test e0e283b0cbeaa97eeee183e1cdb91fa73d720866
 F test/ioerr.test 45c8feebe608d7f456fea27ff27a0aaaf0b9c636
-F test/join.test 178b25dc3c5be6cbdd195b904e66bee62475d0bf
+F test/join.test c97267c19294bf1fa4e81087edad179828bced88
 F test/limit.test 9ffb965a0f5bf7152187ef3d8d1249b96e5620bf
 F test/lock.test 388a3a10962d2d571c0c1821cc35bf069ee73473
 F test/main.test c66b564554b770ee7fdbf6a66c0cd90329bc2c85
@@ -155,7 +155,7 @@ F www/speed.tcl cb4c10a722614aea76d2c51f32ee43400d5951be
 F www/sqlite.tcl ae3dcfb077e53833b59d4fcc94d8a12c50a44098
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 2013852c27a02a091d39a766bc87cff329f21218
-P 5db98b3f4048fc8cd28d8fd225f2b0221ccf1d17
-R 8776043362c8c9062e2ce89efb27c5e7
+P 6ef91a364b2922f078b7de81816bca3f2ca0fe46
+R 6cd2342e328368bdcfdfb261e7153b9c
 U drh
-Z 7efa93af63d1c797dd26115959a7737f
+Z 02cf9dbf86ae6f6970569d7a82f43c8c

diff --git a/manifest.uuid b/manifest.uuid
index 5fefcee8166100908b4219fb1b9912d7ed497b1a..b141deb5d600fe1a3c616f6bf0322368db511064 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6ef91a364b2922f078b7de81816bca3f2ca0fe46
\ No newline at end of file
+6a45fe3bd7e19cf9c20fc6cb65b0269cdd704490
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index 07819c1b237892a20b0edcbf6e57bb659d96cccc..84beb0c0f31345f8039f91e3b4b4af2f0f6aca8d 100644 (file)
--- 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.204 2003/02/16 22:21:32 drh Exp $
+** $Id: vdbe.c,v 1.205 2003/02/20 01:48:13 drh Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -4191,6 +4191,7 @@ case OP_NullRow: {
 
   if( VERIFY( i>=0 && i<p->nCursor && ) (pCrsr = p->aCsr[i].pCursor)!=0 ){
     p->aCsr[i].nullRow = 1;
+    p->aCsr[i].recnoIsValid = 0;
   }
   break;
 }

diff --git a/test/join.test b/test/join.test
index 4562184f1abceda62dfa9ce6f2e030d53f99d004..c8cb10da01ab73f76718de854c78b0948fb216fe 100644 (file)
--- a/test/join.test
+++ b/test/join.test
@@ -12,7 +12,7 @@
 #
 # This file implements tests for joins, including outer joins.
 #
-# $Id: join.test,v 1.7 2002/10/27 19:35:35 drh Exp $
+# $Id: join.test,v 1.8 2003/02/20 01:48:13 drh Exp $
 
 set testdir [file dirname $argv0]
 source $testdir/tester.tcl
@@ -352,4 +352,29 @@ do_test join-6.8 {
 } {1 2 3 2 3 4 2 3 4 3 4 5 3 4 5 {} {} {}}
 
 
+# A test for ticket #247.
+#
+do_test join-7.1 {
+  execsql {
+    CREATE TABLE t7 (x, y);
+    INSERT INTO t7 VALUES ("pa1", 1);
+    INSERT INTO t7 VALUES ("pa2", NULL);
+    INSERT INTO t7 VALUES ("pa3", NULL);
+    INSERT INTO t7 VALUES ("pa4", 2);
+    INSERT INTO t7 VALUES ("pa30", 131);
+    INSERT INTO t7 VALUES ("pa31", 130);
+    INSERT INTO t7 VALUES ("pa28", NULL);
+
+    CREATE TABLE t8 (a integer primary key, b);
+    INSERT INTO t8 VALUES (1, "pa1");
+    INSERT INTO t8 VALUES (2, "pa4");
+    INSERT INTO t8 VALUES (3, NULL);
+    INSERT INTO t8 VALUES (4, NULL);
+    INSERT INTO t8 VALUES (130, "pa31");
+    INSERT INTO t8 VALUES (131, "pa30");
+
+    SELECT coalesce(t8.a,999) from t7 LEFT JOIN t8 on y=a;
+  }
+} {1 999 999 2 131 130 999}
+
 finish_test