Skip to content

Commit d6e6d7a

Browse files
krlmlrkrlmlr
authored
Merge pull request #368 from r-dbi/f-split
- Make method definition more similar to S3. All `setMethod()` calls refer to top-level functions (#368).
2 parents 278460d + 66ff605 commit d6e6d7a

File tree

196 files changed

+5199
-3208
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

196 files changed

+5199
-3208
lines changed

‎DESCRIPTION‎

Lines changed: 135 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,16 @@ Package: DBI
22
Title: R Database Interface
33
Version: 1.1.1.9000
44
Date: 2021-01-04
5-
Authors@R:
6-
c(person(given = "R Special Interest Group on Databases (R-SIG-DB)",
7-
role = "aut"),
8-
person(given = "Hadley",
9-
family = "Wickham",
10-
role = "aut"),
11-
person(given = "Kirill",
12-
family = "M\u00fcller",
13-
role = c("aut", "cre"),
14-
email = "[email protected]",
15-
comment = c(ORCID = "0000-0002-1416-3412")),
16-
person(given = "R Consortium",
17-
role = "fnd"))
18-
Description: A database interface definition for communication
19-
between R and relational database management systems. All classes in
20-
this package are virtual and need to be extended by the various R/DBMS
5+
Authors@R: c(
6+
person("R Special Interest Group on Databases (R-SIG-DB)", role = "aut"),
7+
person("Hadley", "Wickham", role = "aut"),
8+
person("Kirill", "Müller", , "[email protected]", role = c("aut", "cre"),
9+
comment = c(ORCID = "0000-0002-1416-3412")),
10+
person("R Consortium", role = "fnd")
11+
)
12+
Description: A database interface definition for communication between R
13+
and relational database management systems. All classes in this
14+
package are virtual and need to be extended by the various R/DBMS
2115
implementations.
2216
License: LGPL (>= 2.1)
2317
URL: https://dbi.r-dbi.org, https://github.com/r-dbi/DBI
@@ -28,47 +22,155 @@ Depends:
2822
Suggests:
2923
blob,
3024
covr,
25+
DBItest,
3126
dbplyr,
3227
downlit,
3328
dplyr,
3429
glue,
3530
hms,
3631
knitr,
3732
magrittr,
33+
RMariaDB,
3834
rmarkdown,
3935
rprojroot,
40-
RMariaDB,
4136
RSQLite (>= 1.1-2),
4237
testthat,
4338
xml2
4439
VignetteBuilder:
4540
knitr
41+
Config/autostyle/scope: line_breaks
42+
Config/autostyle/strict: false
43+
Config/Needs/check: r-dbi/DBItest
4644
Encoding: UTF-8
47-
Roxygen: list(markdown = TRUE, roclets = c("collate",
48-
"namespace", "rd"))
45+
Roxygen: list(markdown = TRUE, roclets = c("collate", "namespace", "rd"))
4946
RoxygenNote: 7.1.2
5047
Config/Needs/website: RMariaDB, RPostgres, odbc, duckdb
5148
Collate:
52-
'hidden.R'
53-
'DBObject.R'
54-
'DBDriver.R'
55-
'table.R'
56-
'DBConnection.R'
49+
'DBIObject.R'
50+
'DBIDriver.R'
51+
'Id.R'
52+
'DBIConnection.R'
5753
'ANSI.R'
58-
'DBConnector.R'
5954
'DBI-package.R'
60-
'DBResult.R'
55+
'DBIConnector.R'
56+
'DBIResult.R'
57+
'SQL.R'
58+
'SQLKeywords.R'
59+
'SQLKeywords_DBIObject.R'
60+
'SQLKeywords_missing.R'
6161
'data-types.R'
6262
'data.R'
63+
'dbAppendTable.R'
64+
'dbAppendTable_DBIConnection.R'
65+
'dbBegin.R'
66+
'dbBind.R'
67+
'dbCallProc.R'
68+
'dbCanConnect.R'
69+
'dbCanConnect_DBIDriver.R'
70+
'dbClearResult.R'
71+
'dbColumnInfo.R'
72+
'dbCommit.R'
73+
'dbConnect.R'
74+
'dbConnect_DBIConnector.R'
75+
'dbCreateTable.R'
76+
'dbCreateTable_DBIConnection.R'
77+
'dbDataType.R'
78+
'dbDataType_DBIConnector.R'
79+
'dbDataType_DBIObject.R'
80+
'dbDisconnect.R'
81+
'dbDriver.R'
82+
'dbDriver_character.R'
83+
'dbExecute.R'
84+
'dbExecute_DBIConnection_character.R'
85+
'dbExistsTable.R'
86+
'dbExistsTable_DBIConnection_Id.R'
87+
'dbFetch.R'
88+
'dbFetch_DBIResult.R'
89+
'dbGetConnectArgs.R'
90+
'dbGetConnectArgs_DBIConnector.R'
91+
'dbGetException.R'
92+
'dbGetInfo.R'
93+
'dbGetInfo_DBIResult.R'
94+
'dbGetQuery.R'
95+
'dbGetQuery_DBIConnection_character.R'
96+
'dbGetRowCount.R'
97+
'dbGetRowsAffected.R'
98+
'dbGetStatement.R'
99+
'dbHasCompleted.R'
100+
'dbIsReadOnly.R'
101+
'dbIsReadOnly_DBIConnector.R'
102+
'dbIsReadOnly_DBIObject.R'
103+
'dbIsValid.R'
104+
'dbListConnections.R'
105+
'dbListFields.R'
106+
'dbListFields_DBIConnection_Id.R'
107+
'dbListFields_DBIConnection_character.R'
108+
'dbListObjects.R'
109+
'dbListObjects_DBIConnection_ANY.R'
110+
'dbListResults.R'
111+
'dbListTables.R'
112+
'dbQuoteIdentifier.R'
113+
'dbQuoteIdentifier_DBIConnection.R'
114+
'dbQuoteLiteral.R'
115+
'dbQuoteLiteral_DBIConnection.R'
116+
'dbQuoteString.R'
117+
'dbQuoteString_DBIConnection.R'
118+
'dbReadTable.R'
119+
'dbReadTable_DBIConnection_Id.R'
120+
'dbReadTable_DBIConnection_character.R'
121+
'dbRemoveTable.R'
122+
'dbRemoveTable_DBIConnection_Id.R'
123+
'dbRollback.R'
124+
'dbSendQuery.R'
125+
'dbSendStatement.R'
126+
'dbSendStatement_DBIConnection_character.R'
127+
'dbSetDataMappings.R'
128+
'dbUnloadDriver.R'
129+
'dbUnquoteIdentifier.R'
130+
'dbUnquoteIdentifier_DBIConnection.R'
131+
'dbWithTransaction.R'
132+
'dbWithTransaction_DBIConnection.R'
133+
'dbWriteTable.R'
134+
'dbWriteTable_DBIConnection_Id_ANY.R'
135+
'dbiDataType.R'
136+
'dbiDataType_AsIs.R'
137+
'dbiDataType_Date.R'
138+
'dbiDataType_POSIXct.R'
139+
'dbiDataType_character.R'
140+
'dbiDataType_data.frame.R'
141+
'dbiDataType_difftime.R'
142+
'dbiDataType_integer.R'
143+
'dbiDataType_list.R'
144+
'dbiDataType_logical.R'
145+
'dbiDataType_numeric.R'
63146
'deprecated.R'
147+
'fetch.R'
64148
'hms.R'
65149
'interpolate.R'
66-
'list-pairs.R'
67-
'quote.R'
68-
'rd.R'
150+
'isSQLKeyword.R'
151+
'isSQLKeyword_DBIObject_character.R'
152+
'make.db.names.R'
153+
'make.db.names_DBIObject_character.R'
154+
'methods_as_rd.R'
69155
'rownames.R'
70-
'table-create.R'
71-
'table-insert.R'
156+
'show_AnsiConnection.R'
157+
'show_DBIConnection.R'
158+
'show_DBIConnector.R'
159+
'show_DBIDriver.R'
160+
'show_DBIResult.R'
161+
'show_Id.R'
162+
'show_SQL.R'
163+
'sqlAppendTable.R'
164+
'sqlAppendTableTemplate.R'
165+
'sqlAppendTable_DBIConnection.R'
166+
'sqlCreateTable.R'
167+
'sqlCreateTable_DBIConnection.R'
168+
'sqlData.R'
169+
'sqlData_DBIConnection.R'
170+
'sqlInterpolate.R'
171+
'sqlInterpolate_DBIConnection.R'
172+
'sqlParseVariables.R'
173+
'sqlParseVariables_DBIConnection.R'
174+
'summary.R'
175+
'summary_DBIObject.R'
72176
'transactions.R'
73-
Config/autostyle/scope: line_breaks
74-
Config/autostyle/strict: false

‎R/ANSI.R‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#' @include hidden.R
2-
#' @include DBConnection.R
3-
#' @include DBDriver.R
1+
#' @include DBIConnection.R
2+
#' @include DBIDriver.R
43
setClass("AnsiConnection", contains = "DBIConnection")
54

65
#' A dummy DBI connector that simulates ANSI-SQL compliance
@@ -13,8 +12,12 @@ ANSI <- function() {
1312
new("AnsiConnection")
1413
}
1514

16-
#' @rdname hidden_aliases
17-
#' @export
18-
setMethod("show", "AnsiConnection", function(object) {
19-
cat("<AnsiConnection>\n")
20-
})
15+
#' Internal page for hidden aliases
16+
#'
17+
#' For S4 methods that require a documentation entry but only clutter the index.
18+
#'
19+
#' @usage NULL
20+
#' @format NULL
21+
#' @keywords internal
22+
#' @docType methods
23+
hidden_aliases <- NULL

0 commit comments

Comments
 (0)