Have sqlite3session_diff() automatically attach tables to session objects, as it has always been documented to do.

FossilOrigin-Name: 99827144f112303e27a829c990b1858d227bd7369095100a435c367637985fad

2 files changed, 30 insertions, 0 deletions

diff --git a/ext/session/sessionD.test b/ext/session/sessionD.test
index 9fccbfa96..f60fbabc2 100644
--- a/ext/session/sessionD.test
+++ b/ext/session/sessionD.test
@@ -230,4 +230,32 @@ do_catchsql_test 4.5.2 {
   SELECT * FROM ixua.i8;
 } {1 {no such table: ixua.i8}}
 
+#-------------------------------------------------------------------------
+# Test that sqlite3session_diff() really does automatically attach tables,
+# as documented.
+#
+reset_db
+forcedelete test.db2
+do_execsql_test 4.0 {
+  ATTACH 'test.db2' AS two;
+  CREATE TABLE two.t1(a PRIMARY KEY, b, c);
+  CREATE TABLE t1(a PRIMARY KEY, b, c);
+
+  INSERT INTO two.t1 VALUES(1, 2, 3), (4, 5, 6), (7, 8, 9);
+}
+
+do_test 4.1 {
+  sqlite3session S db main
+  S attach t8
+  S diff two t1
+} {}
+
+do_changeset_test 4.2 S {
+  {DELETE t1 0 X.. {i 1 i 2 i 3} {}} 
+  {DELETE t1 0 X.. {i 4 i 5 i 6} {}}
+  {DELETE t1 0 X.. {i 7 i 8 i 9} {}}
+}
+
+S delete
+
 finish_test
diff --git a/ext/session/sqlite3session.c b/ext/session/sqlite3session.c
index 7d6f21255..6c386f42e 100644
--- a/ext/session/sqlite3session.c
+++ b/ext/session/sqlite3session.c
@@ -2216,7 +2216,9 @@ int sqlite3session_diff(
     SessionTable *pTo;            /* Table zTbl */
 
     /* Locate and if necessary initialize the target table object */
+    pSession->bAutoAttach++;
     rc = sessionFindTable(pSession, zTbl, &pTo);
+    pSession->bAutoAttach--;
     if( pTo==0 ) goto diff_out;
     if( sessionInitTable(pSession, pTo, pSession->db, pSession->zDb) ){
       rc = pSession->rc;