Make method definition more similar to S3

DESCRIPTION

@@ -67,16 +67,56 @@ Collate:
     'MariaDBConnection.R'
     'MariaDBDriver.R'
     'MariaDBResult.R'
-    'RMariaDB.R'
+    'RMariaDB-package.R'
     'RcppExports.R'
     'coerce.R'
+    'compatRowNames.R'
     'connect.R'
+    'dbAppendTable_MariaDBConnection.R'
+    'dbBegin_MariaDBConnection.R'
+    'dbBind_MariaDBResult.R'
+    'dbClearResult_MariaDBResult.R'
+    'dbColumnInfo_MariaDBResult.R'
+    'dbCommit_MariaDBConnection.R'
+    'dbConnect_MariaDBDriver.R'
+    'dbDataType_MariaDBConnection.R'
+    'dbDataType_MariaDBDriver.R'
+    'dbDisconnect_MariaDBConnection.R'
+    'dbExistsTable_MariaDBConnection_character.R'
+    'dbFetch_MariaDBResult.R'
+    'dbGetInfo_MariaDBConnection.R'
+    'dbGetInfo_MariaDBDriver.R'
+    'dbGetRowCount_MariaDBResult.R'
+    'dbGetRowsAffected_MariaDBResult.R'
+    'dbGetStatement_MariaDBResult.R'
+    'dbHasCompleted_MariaDBResult.R'
+    'dbIsValid_MariaDBConnection.R'
+    'dbIsValid_MariaDBDriver.R'
+    'dbIsValid_MariaDBResult.R'
+    'dbListObjects_MariaDBConnection_ANY.R'
+    'dbListTables_MariaDBConnection.R'
+    'dbQuoteIdentifier_MariaDBConnection_Id.R'
+    'dbQuoteIdentifier_MariaDBConnection_SQL.R'
+    'dbQuoteIdentifier_MariaDBConnection_character.R'
+    'dbQuoteLiteral_MariaDBConnection.R'
+    'dbQuoteString_MariaDBConnection_SQL.R'
+    'dbQuoteString_MariaDBConnection_character.R'
+    'dbReadTable_MariaDBConnection_character.R'
+    'dbRemoveTable_MariaDBConnection_character.R'
+    'dbRollback_MariaDBConnection.R'
+    'dbSendQuery_MariaDBConnection_character.R'
+    'dbSendStatement_MariaDBConnection_character.R'
+    'dbUnloadDriver_MariaDBDriver.R'
+    'dbUnquoteIdentifier_MariaDBConnection_SQL.R'
+    'dbWriteTable_MariaDBConnection_character_character.R'
+    'dbWriteTable_MariaDBConnection_character_data.frame.R'
     'default.R'
     'export.R'
     'names.R'
     'query.R'
     'quote.R'
-    'rownames.R'
+    'show_MariaDBConnection.R'
+    'sqlData_MariaDBConnection.R'
     'table.R'
     'transaction.R'
     'utils.R'

R/MariaDBConnection.R

@@ -31,75 +31,3 @@ format.MariaDBConnection <- function(x, ...) {
 
   paste0("<MariaDBConnection> ", details)
 }
-
-# show()
-#' @export
-#' @rdname MariaDBConnection-class
-setMethod("show", "MariaDBConnection", function(object) {
-  info <- dbGetInfo(object)
-  cat("<MariaDBConnection>\n")
-  if (dbIsValid(object)) {
-    cat("  Host:    ", info$host, "\n", sep = "")
-    cat("  Server:  ", info$serverVersion, "\n", sep = "")
-    cat("  Client:  ", info$client, "\n", sep = "")
-    # cat("  Proto:   ", info$protocolVersion, "\n", sep = "")
-    # cat("  ThreadId:", info$threadId, "\n", sep = "")
-    # cat("  User:    ", info$user, "\n", sep = "")
-    # cat("  ConType: ", info$conType, "\n", sep = "")
-    # cat("  Db:      ", info$dbname, "\n", sep = "")
-  } else {
-    cat("  DISCONNECTED\n")
-  }
-})
-
-# dbIsValid()
-#' @export
-#' @rdname MariaDBConnection-class
-setMethod("dbIsValid", "MariaDBConnection", function(dbObj, ...) {
-  connection_valid(dbObj@ptr)
-})
-
-# dbDisconnect()
-#' @export
-#' @rdname MariaDBConnection-class
-setMethod("dbDisconnect", "MariaDBConnection", function(conn, ...) {
-  connection_release(conn@ptr)
-  invisible(TRUE)
-})
-
-# dbSendQuery()
-
-# dbSendStatement()
-
-# dbDataType()
-
-# dbQuoteString()
-
-# dbQuoteIdentifier()
-
-# dbWriteTable()
-
-# dbReadTable()
-
-# dbListTables()
-
-# dbExistsTable()
-
-# dbListFields()
-
-# dbRemoveTable()
-
-# dbGetInfo()
-#' @export
-#' @rdname MariaDBConnection-class
-setMethod("dbGetInfo", "MariaDBConnection", function(dbObj, what = "", ...) {
-  connection_info(dbObj@ptr)
-})
-
-# dbBegin()
-
-# dbCommit()
-
-# dbRollback()
-
-# other

R/MariaDBDriver.R

@@ -10,17 +10,6 @@ setClass("MariaDBDriver",
   contains = "DBIDriver",
 )
 
-#' @rdname MariaDBDriver-class
-setMethod("dbUnloadDriver", "MariaDBDriver", function(drv, ...) {
-  TRUE
-})
-
-#' @rdname MariaDBDriver-class
-#' @export
-setMethod("dbIsValid", "MariaDBDriver", function(dbObj, ...) {
-  TRUE
-})
-
 #' MariaDB Check for Compiled Versus Loaded Client Library Versions
 #'
 #' This function prints out the compiled and loaded client library versions.
@@ -35,18 +24,5 @@ mariadbClientLibraryVersions <- function() {
   version()
 }
 
-
-
 # Set during installation time for the correct library
 PACKAGE_VERSION <- utils::packageVersion(utils::packageName())
-
-#' @rdname MariaDBDriver-class
-#' @export
-setMethod("dbGetInfo", "MariaDBDriver", function(dbObj, ...) {
-  client_version <- names(version())[[2]]
-
-  list(
-    driver.version = PACKAGE_VERSION,
-    client.version = package_version(client_version)
-  )
-})

R/MariaDBResult.R

@@ -14,9 +14,3 @@ setClass("MariaDBResult",
     conn = "MariaDBConnection"
   )
 )
-
-#' @rdname MariaDBResult-class
-#' @export
-setMethod("dbIsValid", "MariaDBResult", function(dbObj, ...) {
-  result_valid(dbObj@ptr)
-})