Use named savepoint in dbWriteTable.

Closes #41
r-dbi · Sep 5, 2014 · f428333 · f428333
1 parent a028da4
commit f428333
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/NEWS b/NEWS
@@ -21,7 +21,9 @@ Version 0.11.6.9000
   FALSE. It will automatically add row names only if they are character,
   not integer.  When loading a file from disk, `dbWriteTable()` will no longer
   attempt to guess the correct values for `row.names` and `header` - instead
-  supply them explicitly if the defaults are incorrect.
+  supply them explicitly if the defaults are incorrect. It now uses 
+  named save points so `dbWriteTable()` can be nested inside other 
+  transactions (#41).
 
 - `dbBeginTransaction()` has been deprecated. Please use `dbBegin()` instead.
   (#)

diff --git a/R/ConnectionWrite.R b/R/ConnectionWrite.R
@@ -42,8 +42,8 @@ setMethod("dbWriteTable", signature("SQLiteConnection", "character", "data.frame
     if (overwrite && append)
       stop("overwrite and append cannot both be TRUE", call. = FALSE)
 
-    dbBegin(conn)
-    on.exit(dbRollback(conn))
+    dbBegin(conn, "dbWriteTable")
+    on.exit(dbRollback(conn, "dbWriteTable"))
 
     found <- dbExistsTable(conn, name)
     if (found && !overwrite && !append) {
@@ -74,7 +74,7 @@ setMethod("dbWriteTable", signature("SQLiteConnection", "character", "data.frame
     }
 
     on.exit(NULL)
-    dbCommit(conn)
+    dbCommit(conn, "dbWriteTable")
     TRUE
   }
 )