diff --git a/DESCRIPTION b/DESCRIPTION index 5e3c2950..429197f5 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -48,7 +48,7 @@ Config/testthat/edition: 3 Encoding: UTF-8 NeedsCompilation: yes Roxygen: list(markdown = TRUE) -RoxygenNote: 7.3.2 +RoxygenNote: 7.3.2.9000 SystemRequirements: libmariadb-client-lgpl-dev or libmariadb-dev or libmysqlclient-dev, with libssl-dev (deb), mariadb-connector-c-devel or mariadb-devel (rpm), mariadb-connector-c or mysql-connector-c diff --git a/man/Client-flags.Rd b/man/Client-flags.Rd index 15d36ce8..bf4a5b6e 100644 --- a/man/Client-flags.Rd +++ b/man/Client-flags.Rd @@ -23,7 +23,7 @@ \alias{CLIENT_SSL_VERIFY_SERVER_CERT} \title{Client flags} \description{ -Use for the \code{client.flag} argument to \code{\link[=dbConnect]{dbConnect()}}, multiple flags can be +Use for the \code{client.flag} argument to \code{\link[DBI:dbConnect]{DBI::dbConnect()}}, multiple flags can be combined with \code{+} or \code{\link[=bitwOr]{bitwOr()}}. The flags are provided for completeness. To enforce SSL for the DB connection, add the flag \code{CLIENT_SSL}. diff --git a/man/dbConnect-MariaDBDriver-method.Rd b/man/dbConnect-MariaDBDriver-method.Rd index 497198dc..4597c93c 100644 --- a/man/dbConnect-MariaDBDriver-method.Rd +++ b/man/dbConnect-MariaDBDriver-method.Rd @@ -86,7 +86,7 @@ encryption.} \item{groups}{deprecated, use \code{group} instead.} \item{load_data_local_infile}{Set to \code{TRUE} to use \verb{LOAD DATA LOCAL INFILE} -in \code{\link[=dbWriteTable]{dbWriteTable()}} and \code{\link[=dbAppendTable]{dbAppendTable()}} by default. +in \code{\link[DBI:dbWriteTable]{DBI::dbWriteTable()}} and \code{\link[DBI:dbAppendTable]{DBI::dbAppendTable()}} by default. This capability is disabled by default on the server side for recent versions of MySQL Server.} diff --git a/man/mariadb-tables.Rd b/man/mariadb-tables.Rd index 9ce5a540..94bf3232 100644 --- a/man/mariadb-tables.Rd +++ b/man/mariadb-tables.Rd @@ -137,7 +137,7 @@ indicating whether the operation was successful. These methods read or write entire tables from a MariaDB database. } \details{ -When using \code{load_data_local_infile = TRUE} in \code{\link[=dbConnect]{dbConnect()}}, +When using \code{load_data_local_infile = TRUE} in \code{\link[DBI:dbConnect]{DBI::dbConnect()}}, pass \code{safe = FALSE} to \code{dbAppendTable()} to avoid transactions. Because \verb{LOAD DATA INFILE} is used internally, this means that rows violating primary key constraints are now silently ignored. diff --git a/man/query.Rd b/man/query.Rd index 66029ca5..72adabe9 100644 --- a/man/query.Rd +++ b/man/query.Rd @@ -65,13 +65,13 @@ This allows passing multiple statements (with \link{CLIENT_MULTI_STATEMENTS}) and turns off the ability to pass parameters.} } \description{ -To retrieve results a chunk at a time, use \code{\link[=dbSendQuery]{dbSendQuery()}}, -\code{\link[=dbFetch]{dbFetch()}}, then \code{\link[=dbClearResult]{dbClearResult()}}. Alternatively, if you want all the -results (and they'll fit in memory) use \code{\link[=dbGetQuery]{dbGetQuery()}} which sends, +To retrieve results a chunk at a time, use \code{\link[DBI:dbSendQuery]{DBI::dbSendQuery()}}, +\code{\link[DBI:dbFetch]{DBI::dbFetch()}}, then \code{\link[DBI:dbClearResult]{DBI::dbClearResult()}}. Alternatively, if you want all the +results (and they'll fit in memory) use \code{\link[DBI:dbGetQuery]{DBI::dbGetQuery()}} which sends, fetches and clears for you. For data manipulation queries (i.e. queries that do not return data, such as \code{UPDATE}, \code{DELETE}, etc.), -\code{\link[=dbSendStatement]{dbSendStatement()}} serves as a counterpart to \code{\link[=dbSendQuery]{dbSendQuery()}}, while -\code{\link[=dbExecute]{dbExecute()}} corresponds to \code{\link[=dbGetQuery]{dbGetQuery()}}. +\code{\link[DBI:dbSendStatement]{DBI::dbSendStatement()}} serves as a counterpart to \code{\link[DBI:dbSendQuery]{DBI::dbSendQuery()}}, while +\code{\link[DBI:dbExecute]{DBI::dbExecute()}} corresponds to \code{\link[DBI:dbGetQuery]{DBI::dbGetQuery()}}. } \examples{ if (mariadbHasDefault()) {