Merge branch 'master' into f-#113-temporary

R/table.R

@@ -29,6 +29,7 @@ NULL
 #'   with \code{\link[DBI]{dbDataType}}).
 #' @param temporary a logical specifying whether the new table should be
 #'   temporary. Its default is \code{FALSE}.
+#' @param ... Needed for compatibility with generic. Otherwise ignored.
 #' @details In a primary key column qualified with
 #' \href{https://www.sqlite.org/autoinc.html}{\code{AUTOINCREMENT}}, missing
 #' values will be assigned the next largest positive integer,
@@ -283,6 +284,7 @@ string_to_utf8 <- function(value) {
 #' @param select.cols  A SQL statement (in the form of a character vector of
 #'    length 1) giving the columns to select. E.g. "*" selects all columns,
 #'    "x,y,z" selects three columns named as listed.
+#' @param ... Needed for compatibility with generic. Otherwise ignored.
 #' @inheritParams DBI::sqlRownamesToColumn
 #' @export
 #' @examples
@@ -321,6 +323,7 @@ setMethod("dbReadTable", c("SQLiteConnection", "character"),
 #'
 #' @param conn An existing \code{\linkS4class{SQLiteConnection}}
 #' @param name character vector of length 1 giving name of table to remove
+#' @param ... Needed for compatibility with generic. Otherwise ignored.
 #' @export
 setMethod("dbRemoveTable", c("SQLiteConnection", "character"),
   function(conn, name, ...) {
@@ -334,6 +337,7 @@ setMethod("dbRemoveTable", c("SQLiteConnection", "character"),
 #'
 #' @param conn An existing \code{\linkS4class{SQLiteConnection}}
 #' @param name String, name of table. Match is case insensitive.
+#' @param ... Needed for compatibility with generic. Otherwise ignored.
 #' @export
 setMethod(
   "dbExistsTable", c("SQLiteConnection", "character"),
@@ -349,6 +353,7 @@ setMethod(
 #' List available SQLite tables.
 #'
 #' @param conn An existing \code{\linkS4class{SQLiteConnection}}
+#' @param ... Needed for compatibility with generic. Otherwise ignored.
 #' @export
 setMethod("dbListTables", "SQLiteConnection", function(conn, ...) {
   rs <- sqliteListTables(conn)
@@ -383,6 +388,7 @@ sqliteListTablesQuery <- function(conn, name = NULL) {
 #'
 #' @param conn An existing \code{\linkS4class{SQLiteConnection}}
 #' @param name a length 1 character vector giving the name of a table.
+#' @param ... Needed for compatibility with generic. Otherwise ignored.
 #' @export
 #' @examples
 #' con <- dbConnect(SQLite())

R/transactions.R

@@ -12,6 +12,7 @@ NULL
 #'   \code{\link[DBI]{dbConnect}}
 #' @param name Supply a name to use a named savepoint. This allows you to
 #'   nest multiple transaction
+#' @param ... Needed for compatibility with generic. Otherwise ignored.
 #' @return A boolean, indicating success or failure.
 #' @examples
 #' library(DBI)
@@ -47,7 +48,7 @@ NULL
 
 #' @export
 #' @rdname sqlite-transaction
-setMethod("dbBegin", "SQLiteConnection", function(conn, ..., name = NULL) {
+setMethod("dbBegin", "SQLiteConnection", function(conn, name = NULL, ...) {
   if (is.null(name)) {
     dbExecute(conn, "BEGIN")
   } else {
@@ -59,7 +60,7 @@ setMethod("dbBegin", "SQLiteConnection", function(conn, ..., name = NULL) {
 
 #' @export
 #' @rdname sqlite-transaction
-setMethod("dbCommit", "SQLiteConnection", function(conn, ..., name = NULL) {
+setMethod("dbCommit", "SQLiteConnection", function(conn, name = NULL, ...) {
   if (is.null(name)) {
     dbExecute(conn, "COMMIT")
   } else {
@@ -71,7 +72,7 @@ setMethod("dbCommit", "SQLiteConnection", function(conn, ..., name = NULL) {
 
 #' @export
 #' @rdname sqlite-transaction
-setMethod("dbRollback", "SQLiteConnection", function(conn, ..., name = NULL) {
+setMethod("dbRollback", "SQLiteConnection", function(conn, name = NULL, ...) {
   if (is.null(name)) {
     dbExecute(conn, "ROLLBACK")
   } else {