Changeset: b2ccd452dddb for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b2ccd452dddb Removed Files: clients/R/MonetDB.R/R/mclient.R clients/R/MonetDB.R/man/mclient.Rd Modified Files: clients/R/MonetDB.R/DESCRIPTION clients/R/MonetDB.R/NAMESPACE clients/R/MonetDB.R/NEWS Branch: embedded Log Message:
Removed mclient functionality again, Bug #3868 diffs (96 lines): diff --git a/clients/R/MonetDB.R/DESCRIPTION b/clients/R/MonetDB.R/DESCRIPTION --- a/clients/R/MonetDB.R/DESCRIPTION +++ b/clients/R/MonetDB.R/DESCRIPTION @@ -13,5 +13,5 @@ Description: Allows to pull data from Mo License: MPL (== 1.1) URL: http://monetr.r-forge.r-project.org SystemRequirements: MonetDB, available from http://www.monetdb.org -Collate: mapi.R dbi.R dbapply.R dplyr.R control.R mclient.R +Collate: mapi.R dbi.R dbapply.R dplyr.R control.R Additional_repositories: http://dev.monetdb.org/Assets/R/ diff --git a/clients/R/MonetDB.R/NAMESPACE b/clients/R/MonetDB.R/NAMESPACE --- a/clients/R/MonetDB.R/NAMESPACE +++ b/clients/R/MonetDB.R/NAMESPACE @@ -17,9 +17,6 @@ export(monetdb.server.stop) export(monetdbd.liststatus) export(monetdb.liststatus) -# mclient.R -export(mclient) - # dplyr.R export(src_monetdb) export(src_translate_env.src_monetdb) diff --git a/clients/R/MonetDB.R/NEWS b/clients/R/MonetDB.R/NEWS --- a/clients/R/MonetDB.R/NEWS +++ b/clients/R/MonetDB.R/NEWS @@ -20,7 +20,6 @@ 1.0.0 - Fixed a bug when running in a non-UTF8 locale (Thanks, Marcis) - Fixed a bug when dbWriteTable would not adhere to transactional semantics - Fixed != comparisions in dplyr (Thanks, David) -- New "mclient" function to get a shell-like DB interface - Support for running MonetDB in embedded mode (MonetDBLite) - Support for monetdblite:/some/path URLs in dbConnect() - Fixed an off-by-one error in type conversion (Thanks, Kirill) diff --git a/clients/R/MonetDB.R/R/mclient.R b/clients/R/MonetDB.R/R/mclient.R deleted file mode 100644 --- a/clients/R/MonetDB.R/R/mclient.R +++ /dev/null @@ -1,27 +0,0 @@ -mclient <- function(conn, n=20) { - res <- NA - cat(paste0("Tables: ", paste0(sort(dbListTables(conn)), collapse=", "), "\n")) - cat("Enter SQL queries or table names below. 'Q' to exit.\n") - repeat { - tryCatch({ - repeat { - query <- readline("sql> ") - if (tolower(query) == "q") { - return(invisible(TRUE)) - } - if (tolower(query) %in% tolower(dbListTables(conn))) { - cat(paste0("Fields in table ", query, ": ", paste0(dbListFields(conn, query), collapse=", "), "\n")) - next - } - if (nchar(query) < 5) { - next - } - res <- dbGetQuery(conn, query) - print(head(res, n)) - break - }} - , error = function(e) { - message(e, "\n") - }) - } -} diff --git a/clients/R/MonetDB.R/man/mclient.Rd b/clients/R/MonetDB.R/man/mclient.Rd deleted file mode 100644 --- a/clients/R/MonetDB.R/man/mclient.Rd +++ /dev/null @@ -1,25 +0,0 @@ -\name{mclient} -\alias{mclient} - -\title{ - Run a database shell -} -\description{ - \code{mclient} provides a shell-like database interface. -} -\usage{ -mclient(conn, n=20) -} -\arguments{ - \item{conn}{Database connection} - \item{n}{Number of rows to show in result sets} - } -\value{ - No return value to speak of -} - -\examples{ -\dontrun{ - conn <- dbConnect(MonetDB.R, dbname="demo") - mclient(conn) -}} _______________________________________________ checkin-list mailing list [email protected] https://www.monetdb.org/mailman/listinfo/checkin-list
