From f067ae8eba4b58f8b0fa88791157130e7cdd92f5 Mon Sep 17 00:00:00 2001
From: dan <dan@noemail.net>
Date: Mon, 13 Jul 2020 20:43:13 +0000
Subject: [PATCH] Add test for LEFT JOIN in UPDATE...FROM statement.

FossilOrigin-Name: 4f3dff045ab90e80479960fed64cf36f23dd0e13144edbde15043913ad3faac5
---
 manifest          | 12 +++++++-----
 manifest.uuid     |  2 +-
 test/upfrom1.tcl  | 28 ++++++++++++++++++++++++++++
 test/upfrom1.test | 27 +++++++++++++++++++++++++++
 4 files changed, 63 insertions(+), 6 deletions(-)

diff --git a/manifest b/manifest
index d70a238ea5..57ea212457 100644
--- a/manifest
+++ b/manifest
@@ -1,11 +1,13 @@
 B 5ee3c27e20d12a126fb773b428bb864102b949a5b26a8d5c523753dcedf4be10
-C Add\stest\scases\sand\sfixes\sfor\sUPDATE...FROM\sstatements\sthat\smodify\sprimary\skey\scolumns.
-D 2020-07-13T20:10:29.676
+C Add\stest\sfor\sLEFT\sJOIN\sin\sUPDATE...FROM\sstatement.
+D 2020-07-13T20:43:13.733
 F src/resolve.c 04f4710d3ab0070073b60b5b963158dadfbd049db55d10742d9fbd3f28a3f4b8
 F src/update.c ab137d08171e2bb18a4c6af815bbd6dbe8bfb483ddd7a2b97dfbfb4d95906ee0
 F test/fts4upfrom.test 8df5acb6e10ad73f393d1add082b042ab1db72567888847d098152121e507b34
+F test/upfrom1.tcl df984cb88010af1555812af55e9db44c4df50677395b45d1f30b69b1b6c07b73
+F test/upfrom1.test 2ba1ed45b4a2161fc79f234b9ce4300b0d3deba545e3f23b938fb3ebdbf8758d
 F test/upfrom3.test 8f107ed4dc863e75694867fa38c4f3fccd77a35939f65137ead8a55b6ee45152
-P 5ee3c27e20d12a126fb773b428bb864102b949a5b26a8d5c523753dcedf4be10
-R 2d0f465cbbb27a9a22406ae4b2f12478
+P 47c87af3e52bce10fbcc2cbe832d659b0c204bfb3368d9314fa1b01120129254
+R 65a8d9c8ed218ad0d5909deb2fd7a990
 U dan
-Z cd52a3446e6f9caf8f163180b9da21b7
+Z 74476aad6c58b82c53e5aec1a3d47ff5
diff --git a/manifest.uuid b/manifest.uuid
index c939672a21..9e5ac42c47 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-47c87af3e52bce10fbcc2cbe832d659b0c204bfb3368d9314fa1b01120129254
\ No newline at end of file
+4f3dff045ab90e80479960fed64cf36f23dd0e13144edbde15043913ad3faac5
\ No newline at end of file
diff --git a/test/upfrom1.tcl b/test/upfrom1.tcl
index 5edbb94fe5..e8d3bf21b9 100644
--- a/test/upfrom1.tcl
+++ b/test/upfrom1.tcl
@@ -76,5 +76,33 @@ execsql_test 1.%TN%.6 {
 }
 }]}
 
+execsql_test 2.1 {
+  DROP TABLE IF EXISTS t5;
+  DROP TABLE IF EXISTS m1;
+  DROP TABLE IF EXISTS m2;
+  CREATE TABLE t5(a INTEGER PRIMARY KEY, b TEXT, c TEXT);
+  CREATE TABLE m1(x INTEGER PRIMARY KEY, y TEXT);
+  CREATE TABLE m2(u INTEGER PRIMARY KEY, v TEXT);
+
+  INSERT INTO t5 VALUES(1, 'one', 'ONE');
+  INSERT INTO t5 VALUES(2, 'two', 'TWO');
+  INSERT INTO t5 VALUES(3, 'three', 'THREE');
+  INSERT INTO t5 VALUES(4, 'four', 'FOUR');
+
+  INSERT INTO m1 VALUES(1, 'i');
+  INSERT INTO m1 VALUES(2, 'ii');
+  INSERT INTO m1 VALUES(3, 'iii');
+
+  INSERT INTO m2 VALUES(1, 'I');
+  INSERT INTO m2 VALUES(3, 'II');
+  INSERT INTO m2 VALUES(4, 'III');
+}
+
+execsql_test 2.2 {
+  UPDATE t5 SET b=y, c=v FROM m1 LEFT JOIN m2 ON (x=u) WHERE x=a;
+  SELECT * FROM t5 ORDER BY a;
+}
+
+
 finish_test
 
diff --git a/test/upfrom1.test b/test/upfrom1.test
index da873f16b4..6dbb5a2b27 100644
--- a/test/upfrom1.test
+++ b/test/upfrom1.test
@@ -127,4 +127,31 @@ do_execsql_test 1.2.6 {
   SELECT * FROM t3 ORDER BY a;
 } {1 1 five   2 2 five   3 3 five}
 
+do_execsql_test 2.1 {
+  DROP TABLE IF EXISTS t5;
+  DROP TABLE IF EXISTS m1;
+  DROP TABLE IF EXISTS m2;
+  CREATE TABLE t5(a INTEGER PRIMARY KEY, b TEXT, c TEXT);
+  CREATE TABLE m1(x INTEGER PRIMARY KEY, y TEXT);
+  CREATE TABLE m2(u INTEGER PRIMARY KEY, v TEXT);
+
+  INSERT INTO t5 VALUES(1, 'one', 'ONE');
+  INSERT INTO t5 VALUES(2, 'two', 'TWO');
+  INSERT INTO t5 VALUES(3, 'three', 'THREE');
+  INSERT INTO t5 VALUES(4, 'four', 'FOUR');
+
+  INSERT INTO m1 VALUES(1, 'i');
+  INSERT INTO m1 VALUES(2, 'ii');
+  INSERT INTO m1 VALUES(3, 'iii');
+
+  INSERT INTO m2 VALUES(1, 'I');
+  INSERT INTO m2 VALUES(3, 'II');
+  INSERT INTO m2 VALUES(4, 'III');
+} {}
+
+do_execsql_test 2.2 {
+  UPDATE t5 SET b=y, c=v FROM m1 LEFT JOIN m2 ON (x=u) WHERE x=a;
+  SELECT * FROM t5 ORDER BY a;
+} {1 i I   2 ii {}   3 iii II   4 four FOUR}
+
 finish_test