From 83084267e077b1892af9b519f1c48f2c7f2f64b0 Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Tue, 13 Dec 2022 14:59:28 +0000
Subject: [PATCH] Add extra test cases for applying sessions module changesets
 to databases that have been modified using "ALTER TABLE .. ADD COLUMN".

FossilOrigin-Name: a7b404f21f657f395eddb32e218eae14e09df08fa03f68ca8bba79ea322ce8ba
---
 ext/session/sessionat.test | 54 ++++++++++++++++++++++++++++++++++++++
 manifest                   | 14 +++++-----
 manifest.uuid              |  2 +-
 3 files changed, 62 insertions(+), 8 deletions(-)

diff --git a/ext/session/sessionat.test b/ext/session/sessionat.test
index 8141d92322..e3f9e31ed7 100644
--- a/ext/session/sessionat.test
+++ b/ext/session/sessionat.test
@@ -243,6 +243,60 @@ eval [string map [list %WR% $trailing] {
     sqlite3changeset_apply db $cinv xConflict
     execsql { SELECT * FROM t7 }
   } {1 1 ccc 2 2 ccc 3 3 ccc}
+
+  #-----------------------------------------------------------------------
+  reset_test
+  do_execsql_test $tn.7.0 {
+    CREATE TABLE t8(a PRIMARY KEY, b, c);
+  }
+  do_execsql_test -db db2 $tn.7.1 {
+    CREATE TABLE t8(a PRIMARY KEY, b, c, d DEFAULT 'D', e DEFAULT 'E');
+  }
+
+  do_then_apply_sql {
+    INSERT INTO t8 VALUES(1, 2, 3);
+    INSERT INTO t8 VALUES(4, 5, 6);
+  }
+  do_execsql_test $tn.7.2.1 {
+    SELECT * FROM t8
+  } {1 2 3    4 5 6}
+  do_execsql_test -db db2 $tn.7.2.2 {
+    SELECT * FROM t8
+  } {1 2 3 D E   4 5 6 D E}
+
+  do_then_apply_sql {
+    UPDATE t8 SET c=45 WHERE a=4;
+  }
+  do_execsql_test $tn.7.3.1 {
+    SELECT * FROM t8
+  } {1 2 3    4 5 45}
+  do_execsql_test -db db2 $tn.7.3.2 {
+    SELECT * FROM t8
+  } {1 2 3 D E   4 5 45 D E}
+
+  #-----------------------------------------------------------------------
+  reset_test
+  do_execsql_test $tn.8.0 {
+    CREATE TABLE t9(a PRIMARY KEY, b, c, d, e, f, g, h);
+  }
+  do_execsql_test -db db2 $tn.8.1 {
+    CREATE TABLE t9(a PRIMARY KEY, b, c, d, e, f, g, h, i, j, k, l);
+  }
+  do_then_apply_sql {
+    INSERT INTO t9 VALUES(1, 2, 3, 4, 5, 6, 7, 8);
+  }
+  do_then_apply_sql {
+    UPDATE t9 SET h=450 WHERE a=1
+  }
+  do_execsql_test -db db2 $tn.8.2 {
+    SELECT * FROM t9
+  } {1 2 3 4 5 6 7 450 {} {} {} {}}
+  do_then_apply_sql {
+    UPDATE t9 SET h=NULL
+  }
+  do_execsql_test -db db2 $tn.8.2 {
+    SELECT * FROM t9
+  } {1 2 3 4 5 6 7 {} {} {} {} {}}
 }]
 }
 
diff --git a/manifest b/manifest
index 705e9daa2f..e7f602c224 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Slightly\sfaster\simplementation\sof\ssqlite3ExprAffinity().
-D 2022-12-13T13:33:28.681
+C Add\sextra\stest\scases\sfor\sapplying\ssessions\smodule\schangesets\sto\sdatabases\sthat\shave\sbeen\smodified\susing\s"ALTER\sTABLE\s..\sADD\sCOLUMN".
+D 2022-12-13T14:59:28.942
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -472,7 +472,7 @@ F ext/session/sessionG.test 3828b944cd1285f4379340fd36f8b64c464fc84df6ff3ccbc955
 F ext/session/sessionH.test b17afdbd3b8f17e9bab91e235acf167cf35485db2ab2df0ea8893fbb914741a4
 F ext/session/session_common.tcl f613174665456b2d916ae8df3e5735092a1c1712f36f46840172e9a01e8cc53e
 F ext/session/session_speed_test.c dcf0ef58d76b70c8fbd9eab3be77cf9deb8bc1638fed8be518b62d6cbdef88b3
-F ext/session/sessionat.test 52993535f1230a42f70886643574ba7ae60ef854f8add9c8e3fcc3eb5c564bd2
+F ext/session/sessionat.test 46fd847f6ed194ebb7ebef9fe68b2e2ec88d9c2383a6846cddc5604b35f1d4ae
 F ext/session/sessionbig.test 890ade19e3f80f3d3a3e83821ff79c5e2af906a67ecb5450879f0015cadf101e
 F ext/session/sessiondiff.test ad13dd65664bae26744e1f18eb3cbd5588349b7e9118851d8f9364248d67bcec
 F ext/session/sessionfault.test da273f2712b6411e85e71465a1733b8501dbf6f7
@@ -2067,8 +2067,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 5f11f1c7d5f8b627acd2ace277521d39fe2ffb0ef1dfe532e65fb56ea3dfb4d8
-R 353cfaba8f73d2d43fb52847ef765e4c
-U drh
-Z c0f71aa9c2c28dae346ce7ccc211285d
+P 01cf3278c9c00dddcac67aa4b22ca26a52c31932cba35daa634a56b4c264bdeb
+R 2168ace2713fa491abfdf32af2ae3084
+U dan
+Z f44dc60adae3e752289931c06520949b
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 799153c86f..5209b155bf 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-01cf3278c9c00dddcac67aa4b22ca26a52c31932cba35daa634a56b4c264bdeb
\ No newline at end of file
+a7b404f21f657f395eddb32e218eae14e09df08fa03f68ca8bba79ea322ce8ba
\ No newline at end of file
-- 
2.47.2