From: drh <>
Date: Fri, 13 Jan 2023 19:32:19 +0000 (+0000)
Subject: In expression nodes of type REGISTER with sub-type COLUMN, ensure that the
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=13e5d4f7573acfb88ab829ff3ac119d59d4cb494;p=thirdparty%2Fsqlite.git

In expression nodes of type REGISTER with sub-type COLUMN, ensure that the
iColumn field is set correctly, as otherwise the "IS NULL" operator might
be incorrectly optimized.  Fix for the problem described by
[forum:/forumpost/d010a26798915b53|forum post d010a26798915b53].

FossilOrigin-Name: 76b440c588e9fb267ad05c21daba2eeef980d99a8b5e27ccc454804ac9144f55
---

diff --git a/manifest b/manifest
index f44b384dc5..d712858a54 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sthe\sunused\ssqlite3IsMemdb()\sroutine,\sto\savoid\sa\sharmless\scompiler\nwarning.
-D 2023-01-05T13:55:09.208
+C In\sexpression\snodes\sof\stype\sREGISTER\swith\ssub-type\sCOLUMN,\sensure\sthat\sthe\niColumn\sfield\sis\sset\scorrectly,\sas\sotherwise\sthe\s"IS\sNULL"\soperator\smight\nbe\sincorrectly\soptimized.\s\sFix\sfor\sthe\sproblem\sdescribed\sby\s\n[forum:/forumpost/d010a26798915b53|forum\spost\sd010a26798915b53].
+D 2023-01-13T19:32:19.795
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -635,7 +635,7 @@ F src/pragma.h e690a356c18e98414d2e870ea791c1be1545a714ba623719deb63f7f226d8bb7
 F src/prepare.c 1b02be0441eda4579471fea097f678effcbb77ef0c39ab3f703c837822bcd674
 F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
-F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
+F src/resolve.c 5a98a7bf277aa60584b6bb4c5dd6a9ef2b19537910612c34f596e2901e88596d
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c 9886d6669f5787471aab6ae52af76fad90b53edb1c218fc9ed9d953363bc5184
 F src/shell.c.in f2736e84caf751e94477776df8ab0e4ebc8311de00594d997abd81533debc85c
@@ -1417,7 +1417,7 @@ F test/reindex.test cd9d6021729910ece82267b4f5e1b5ac2911a7566c43b43c176a6a4732e2
 F test/releasetest_data.tcl 0db8aee0c348090fd06da47020ab4ed8ec692e0723427b2f3947d4dfb806f3b0
 F test/resetdb.test 8062cf10a09d8c048f8de7711e94571c38b38168db0e5877ba7561789e5eeb2b
 F test/resolver01.test f4022acafda7f4d40eca94dbf16bc5fc4ac30ceb
-F test/returning1.test 1366e04566cfe1a082d17b1e0f195ec64473c79374b3a5d4ae00c43d885dea31
+F test/returning1.test 3ef7b264598b3292be0cdb028e4acb7524c5fd409b33b78449f894dfd68db334
 F test/returningfault.test ae4c4b5e8745813287a359d9ccdb9d5c883c2e68afb18fb0767937d5de5692a4
 F test/rollback.test 06680159bc6746d0f26276e339e3ae2f951c64812468308838e0a3362d911eaa
 F test/rollback2.test 3f3a4e20401825017df7e7671e9f31b6de5fae5620c2b9b49917f52f8c160a8f
@@ -2055,8 +2055,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P d28d9398a55e0071789087d36ec147ecb207681651a83a0e2da71bc25d689012
-R 78d7e91080e3e1e4c52e373b97eb08aa
+P 4f512a39afe14cb46574a2bc900440ef1ab86e2a3c2a74cee3aa37715cd0c097
+Q +0819a1869a39d54a405259ea323365506a182962a02affdef16a03446005da64
+R c867d2a5fdc3b214a2e504ba23436566
 U drh
-Z 0206b956488672a3e4b2e910a3be1c42
+Z 2155924e12563d046876f91d02d33b43
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index d85a8bb541..33c73202e4 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4f512a39afe14cb46574a2bc900440ef1ab86e2a3c2a74cee3aa37715cd0c097
\ No newline at end of file
+76b440c588e9fb267ad05c21daba2eeef980d99a8b5e27ccc454804ac9144f55
\ No newline at end of file
diff --git a/src/resolve.c b/src/resolve.c
index 1c3a9d9097..0d196ac377 100644
--- a/src/resolve.c
+++ b/src/resolve.c
@@ -506,6 +506,7 @@ static int lookupName(
             if( pParse->bReturning ){
               eNewExprOp = TK_REGISTER;
               pExpr->op2 = TK_COLUMN;
+              pExpr->iColumn = iCol;
               pExpr->iTable = pNC->uNC.iBaseReg + (pTab->nCol+1)*pExpr->iTable +
                  sqlite3TableColumnToStorage(pTab, iCol) + 1;
             }else{
diff --git a/test/returning1.test b/test/returning1.test
index 92e10ee9f4..326af800e1 100644
--- a/test/returning1.test
+++ b/test/returning1.test
@@ -399,5 +399,13 @@ foreach {tn temp} {
   }
 }
 
+# 2022-01-13 https://sqlite.org/forum/forumpost/d010a26798
+#
+reset_db
+do_execsql_test 17.0 {
+  CREATE TABLE bug(id INTEGER PRIMARY KEY NOT NULL, x);
+  INSERT INTO bug(id,x) VALUES(20, NULL);
+  UPDATE bug SET x=NULL WHERE id = 20 RETURNING quote(x), x IS NULL;
+} {NULL 1}
 
 finish_test