Index: src/test8.c
==================================================================
--- src/test8.c
+++ src/test8.c
@@ -11,11 +11,11 @@
 *************************************************************************
 ** Code for testing the virtual table interfaces.  This code
 ** is not included in the SQLite library.  It is used for automated
 ** testing of the SQLite library.
 **
-** $Id: test8.c,v 1.61 2008/03/17 09:36:45 danielk1977 Exp $
+** $Id: test8.c,v 1.62 2008/04/28 20:27:54 drh Exp $
 */
 #include "sqliteInt.h"
 #include "tcl.h"
 #include <stdlib.h>
 #include <string.h>
@@ -59,10 +59,11 @@
   sqlite3_vtab base;
   Tcl_Interp *interp;     /* Tcl interpreter containing debug variables */
   sqlite3 *db;            /* Database connection */
 
   int isPattern;
+  int inTransaction;      /* True if within a transaction */
   char *zThis;            /* Name of the echo table */
   char *zTableName;       /* Name of the real table */
   char *zLogName;         /* Name of the log table */
   int nCol;               /* Number of columns in the real table */
   int *aIndex;            /* Array of size nCol. True if column has an index */
@@ -464,10 +465,14 @@
 
   if( *ppVtab && rc!=SQLITE_OK ){
     echoDestructor(*ppVtab);
     *ppVtab = 0;
   }
+
+  if( rc==SQLITE_OK ){
+    (*(echo_vtab**)ppVtab)->inTransaction = 1;
+  }
 
   return rc;
 }
 
 /* 
@@ -880,10 +885,14 @@
   int bindArgZero = 0;       /* True to bind apData[0] to sql var no. nData */
   int bindArgOne = 0;        /* True to bind apData[1] to sql var no. 1 */
   int i;                     /* Counter variable used by for loops */
 
   assert( nData==pVtab->nCol+2 || nData==1 );
+
+  /* Ticket #3083 - make sure we always start a transaction prior to
+  ** making any changes to a virtual table */
+  assert( pVtab->inTransaction );
 
   /* If apData[0] is an integer and nData>1 then do an UPDATE */
   if( nData>1 && sqlite3_value_type(apData[0])==SQLITE_INTEGER ){
     char *zSep = " SET";
     z = sqlite3_mprintf("UPDATE %Q", pVtab->zTableName);
@@ -999,10 +1008,14 @@
 static int echoBegin(sqlite3_vtab *tab){
   int rc;
   echo_vtab *pVtab = (echo_vtab *)tab;
   Tcl_Interp *interp = pVtab->interp;
   const char *zVal; 
+
+  /* Ticket #3083 - do not start a transaction if we are already in
+  ** a transaction */
+  assert( !pVtab->inTransaction );
 
   rc = echoTransactionCall(tab, "xBegin");
 
   if( rc==SQLITE_OK ){
     /* Check if the $::echo_module_begin_fail variable is defined. If it is,
@@ -1012,17 +1025,24 @@
     zVal = Tcl_GetVar(interp, "echo_module_begin_fail", TCL_GLOBAL_ONLY);
     if( zVal && 0==strcmp(zVal, pVtab->zTableName) ){
       rc = SQLITE_ERROR;
     }
   }
+  if( rc==SQLITE_OK ){
+    pVtab->inTransaction = 1;
+  }
   return rc;
 }
 static int echoSync(sqlite3_vtab *tab){
   int rc;
   echo_vtab *pVtab = (echo_vtab *)tab;
   Tcl_Interp *interp = pVtab->interp;
   const char *zVal; 
+
+  /* Ticket #3083 - Only call xSync if we have previously started a
+  ** transaction */
+  assert( pVtab->inTransaction );
 
   rc = echoTransactionCall(tab, "xSync");
 
   if( rc==SQLITE_OK ){
     /* Check if the $::echo_module_sync_fail variable is defined. If it is,
@@ -1035,18 +1055,36 @@
     }
   }
   return rc;
 }
 static int echoCommit(sqlite3_vtab *tab){
+  echo_vtab *pVtab = (echo_vtab*)tab;
   int rc;
+
+  /* Ticket #3083 - Only call xCommit if we have previously started
+  ** a transaction */
+  assert( pVtab->inTransaction );
+
   sqlite3FaultBenign(SQLITE_FAULTINJECTOR_MALLOC, 1);
   rc = echoTransactionCall(tab, "xCommit");
   sqlite3FaultBenign(SQLITE_FAULTINJECTOR_MALLOC, 0);
+  if( rc==SQLITE_OK ){
+    pVtab->inTransaction = 0;
+  }
   return rc;
 }
 static int echoRollback(sqlite3_vtab *tab){
-  return echoTransactionCall(tab, "xRollback");
+  int rc;
+  echo_vtab *pVtab = (echo_vtab*)tab;
+
+  /* Ticket #3083 - Only call xRollback if we have previously started
+  ** a transaction */
+  assert( pVtab->inTransaction );
+
+  rc = echoTransactionCall(tab, "xRollback");
+  pVtab->inTransaction = 0;
+  return rc;
 }
 
 /*
 ** Implementation of "GLOB" function on the echo module.  Pass
 ** all arguments to the ::echo_glob_overload procedure of TCL

ADDED   test/vtabC.test
Index: test/vtabC.test
==================================================================
--- /dev/null
+++ test/vtabC.test
@@ -0,0 +1,114 @@
+# 2008 April 10
+#
+# The author disclaims copyright to this source code.  In place of
+# a legal notice, here is a blessing:
+#
+#    May you do good and not evil.
+#    May you find forgiveness for yourself and forgive others.
+#    May you share freely, never taking more than you give.
+#
+#***********************************************************************
+# This file implements regression tests for SQLite library.  The
+# focus of this file is is verifying that the xUpdate, xSync, xCommit
+# and xRollback methods are only invoked after an xBegin or xCreate.
+# Ticket #3083.
+#
+# $Id: vtabC.test,v 1.1 2008/04/28 20:27:54 drh Exp $
+
+set testdir [file dirname $argv0]
+source $testdir/tester.tcl
+
+ifcapable !vtab {
+  finish_test
+  return
+}
+
+
+# N will be the number of virtual tables we have defined.
+#
+unset -nocomplain N
+for {set N 1} {$N<=20} {incr N} {
+  db close
+  file delete -force test.db test.db-journal
+  sqlite3 db test.db
+  register_echo_module [sqlite3_connection_pointer db]
+
+  # Create $N tables and $N virtual tables to echo them.
+  #
+  unset -nocomplain tablist
+  set tablist {}
+  do_test vtabC-1.$N.1 {
+    for {set i 1} {$i<=$::N} {incr i} {
+      execsql "CREATE TABLE t${i}(x)"
+      execsql "CREATE VIRTUAL TABLE vt$i USING echo(t$i)"
+      lappend ::tablist t$i vt$i
+    }
+    execsql {SELECT count(*) FROM sqlite_master}
+  } [expr {$N*2}]
+  do_test vtabC-1.$N.2 {
+    execsql {SELECT name FROM sqlite_master}
+  } $tablist
+
+  # Create a table m and add triggers to make changes on all
+  # of the virtual tables when m is changed.
+  #
+  do_test vtabC-1.$N.3 {
+    execsql {CREATE TABLE m(a)}
+    set sql "CREATE TRIGGER rins AFTER INSERT ON m BEGIN\n"
+    for {set i 1} {$i<=$::N} {incr i} {
+      append sql "  INSERT INTO vt$i VALUES(NEW.a+$i);\n"
+    }
+    append sql "END;"
+    execsql $sql
+    execsql {SELECT count(*) FROM sqlite_master}
+  } [expr {$N*2+2}]
+  do_test vtabC-1.$N.4 {
+    execsql {
+      INSERT INTO m VALUES(1000);
+      SELECT * FROM m;
+    }
+  } {1000}
+  for {set j 1} {$j<=$::N} {incr j} {
+    do_test vtabC-1.$N.5.$j {
+      execsql "SELECT * FROM t$::j"
+    } [expr {$j+1000}]
+    do_test vtabC-1.$N.6.$j {
+      execsql "SELECT * FROM vt$::j"
+    } [expr {$j+1000}]
+  }
+  do_test vtabC-1.$N.7 {
+    set sql "CREATE TRIGGER rins2 BEFORE INSERT ON m BEGIN\n"
+    for {set i 1} {$i<=$::N} {incr i} {
+      append sql "  INSERT INTO vt$i VALUES(NEW.a+$i*100);\n"
+    }
+    for {set i 1} {$i<=$::N} {incr i} {
+      append sql "  INSERT INTO vt$i VALUES(NEW.a+$i*10000);\n"
+    }
+    append sql "END;"
+    execsql $sql
+    execsql {SELECT count(*) FROM sqlite_master}
+  } [expr {$N*2+3}]
+  do_test vtabC-1.$N.8 {
+    execsql {
+      INSERT INTO m VALUES(9000000);
+      SELECT * FROM m;
+    }
+  } {1000 9000000}
+  unset -nocomplain res
+  for {set j 1} {$j<=$::N} {incr j} {
+    set res [expr {$j+1000}]
+    lappend res [expr {$j*100+9000000}]
+    lappend res [expr {$j*10000+9000000}]
+    lappend res [expr {$j+9000000}]
+    do_test vtabC-1.$N.9.$j {
+      execsql "SELECT * FROM t$::j"
+    } $res
+    do_test vtabC-1.$N.10.$j {
+      execsql "SELECT * FROM vt$::j"
+    } $res
+  }
+}
+unset -nocomplain res N i j
+
+
+finish_test