Skip to content

fix: partial matching warnings #139

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
salim-b wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: partial matching warnings #139

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed41bf4
fix: partial match warnings
salim-b Jun 18, 2025
00aa476
fix: more partial matching warnings
salim-b Jun 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
90 changes: 45 additions & 45 deletions RPostgreSQL/R/PostgreSQL.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,20 +42,20 @@ setAs("PostgreSQLObject", "PostgreSQLDriver",
)

setMethod("dbUnloadDriver", "PostgreSQLDriver",
def = function(drv, ...) postgresqlCloseDriver(drv, ...),
definition = function(drv, ...) postgresqlCloseDriver(drv, ...),
valueClass = "logical"
)

setMethod("dbGetInfo", "PostgreSQLDriver",
def = function(dbObj, ...) postgresqlDriverInfo(dbObj, ...)
definition = function(dbObj, ...) postgresqlDriverInfo(dbObj, ...)
)

setMethod("dbListConnections", "PostgreSQLDriver",
def = function(drv, ...) dbGetInfo(drv, "connectionIds")[[1]]
definition = function(drv, ...) dbGetInfo(drv, "connectionIds")[[1]]
)

setMethod("summary", "PostgreSQLDriver",
def = function(object, ...) postgresqlDescribeDriver(object, ...)
definition = function(object, ...) postgresqlDescribeDriver(object, ...)
)

##
Expand All @@ -64,47 +64,47 @@ setMethod("summary", "PostgreSQLDriver",
setClass("PostgreSQLConnection", representation("DBIConnection", "PostgreSQLObject"))

setMethod("dbConnect", "PostgreSQLDriver",
def = function(drv, ...) postgresqlNewConnection(drv, ...),
definition = function(drv, ...) postgresqlNewConnection(drv, ...),
valueClass = "PostgreSQLConnection"
)

setMethod("dbConnect", "character",
def = function(drv, ...) postgresqlNewConnection(dbDriver(drv), ...),
definition = function(drv, ...) postgresqlNewConnection(dbDriver(drv), ...),
valueClass = "PostgreSQLConnection"
)

## clone a connection
setMethod("dbConnect", "PostgreSQLConnection",
def = function(drv, ...) postgresqlCloneConnection(drv, ...),
definition = function(drv, ...) postgresqlCloneConnection(drv, ...),
valueClass = "PostgreSQLConnection"
)

setMethod("dbDisconnect", "PostgreSQLConnection",
def = function(conn, ...) postgresqlCloseConnection(conn, ...),
definition = function(conn, ...) postgresqlCloseConnection(conn, ...),
valueClass = "logical"
)

setGeneric("dbEscapeStrings", def = function(conn, string, ...) standardGeneric("dbEscapeStrings"))
setMethod("dbEscapeStrings",
signature(conn="PostgreSQLConnection", string="character"),
def = function(conn, string, ...) postgresqlEscapeStrings(conn, string, ...),
definition = function(conn, string, ...) postgresqlEscapeStrings(conn, string, ...),
valueClass = "character"
)

setMethod("dbSendQuery",
signature(conn = "PostgreSQLConnection", statement = "character"),
def = function(conn, statement,...) postgresqlExecStatement(conn, statement,...),
definition = function(conn, statement,...) postgresqlExecStatement(conn, statement,...),
valueClass = "PostgreSQLResult"
)


setMethod("dbGetQuery",
signature(conn = "PostgreSQLConnection", statement = "character"),
def = function(conn, statement, ...) postgresqlQuickSQL(conn, statement, ...)
definition = function(conn, statement, ...) postgresqlQuickSQL(conn, statement, ...)
)

setMethod("dbGetException", "PostgreSQLConnection",
def = function(conn, ...){
definition = function(conn, ...){
if(!isPostgresqlIdCurrent(conn))
stop(paste("expired", class(conn)))
.Call(RS_PostgreSQL_getException, as(conn, "integer"))
Expand All @@ -113,20 +113,20 @@ setMethod("dbGetException", "PostgreSQLConnection",
)

setMethod("dbGetInfo", "PostgreSQLConnection",
def = function(dbObj, ...) postgresqlConnectionInfo(dbObj, ...)
definition = function(dbObj, ...) postgresqlConnectionInfo(dbObj, ...)
)

setMethod("dbListResults", "PostgreSQLConnection",
def = function(conn, ...) dbGetInfo(conn, "rsId")[[1]]
definition = function(conn, ...) dbGetInfo(conn, "rsId")[[1]]
)

setMethod("summary", "PostgreSQLConnection",
def = function(object, ...) postgresqlDescribeConnection(object, ...)
definition = function(object, ...) postgresqlDescribeConnection(object, ...)
)

## convenience methods
setMethod("dbListTables", "PostgreSQLConnection",
def = function(conn, ...){
definition = function(conn, ...){
out <- dbGetQuery(conn,
paste("select tablename from pg_tables where schemaname !='information_schema'",
"and schemaname !='pg_catalog'", ...))
Expand All @@ -140,13 +140,13 @@ setMethod("dbListTables", "PostgreSQLConnection",
)

setMethod("dbReadTable", signature(conn="PostgreSQLConnection", name="character"),
def = function(conn, name, ...) postgresqlReadTable(conn, name, ...),
definition = function(conn, name, ...) postgresqlReadTable(conn, name, ...),
valueClass = "data.frame"
)

setMethod("dbWriteTable",
signature(conn="PostgreSQLConnection", name="character", value="data.frame"),
def = function(conn, name, value, ...){
definition = function(conn, name, value, ...){
postgresqlWriteTable(conn, name, value, ...)
},
valueClass = "logical"
Expand All @@ -155,15 +155,15 @@ setMethod("dbWriteTable",
## write table from filename (TODO: connections)
setMethod("dbWriteTable",
signature(conn="PostgreSQLConnection", name="character", value="character"),
def = function(conn, name, value, ...){
definition = function(conn, name, value, ...){
postgresqlImportFile(conn, name, value, ...)
},
valueClass = "logical"
)

setMethod("dbExistsTable",
signature(conn="PostgreSQLConnection", name="character"),
def = function(conn, name, ...){
definition = function(conn, name, ...){
qlength <- length(name)
if(qlength == 1){
currentschema <- dbGetQuery(conn, "SELECT current_schema()")
Expand All @@ -189,7 +189,7 @@ setMethod("dbExistsTable",

setMethod("dbRemoveTable",
signature(conn="PostgreSQLConnection", name="character"),
def = function(conn, name, ...){
definition = function(conn, name, ...){
if(dbExistsTable(conn, name)){
rc <- try(dbGetQuery(conn, paste("DROP TABLE", postgresqlTableRef(name))))
!inherits(rc, ErrorClass)
Expand All @@ -201,23 +201,23 @@ setMethod("dbRemoveTable",

setMethod("dbBegin",
signature(conn="PostgreSQLConnection"),
def = function(conn, ...){
definition = function(conn, ...){
rc <- try(dbGetQuery(conn, "BEGIN"))
!inherits(rc, ErrorClass)
},
valueClass = "logical"
)
setMethod("dbCommit",
signature(conn="PostgreSQLConnection"),
def = function(conn, ...){
definition = function(conn, ...){
rc <- try(dbGetQuery(conn, "COMMIT"))
!inherits(rc, ErrorClass)
},
valueClass = "logical"
)
setMethod("dbRollback",
signature(conn="PostgreSQLConnection"),
def = function(conn, ...){
definition = function(conn, ...){
rc <- try(dbGetQuery(conn, "ROLLBACK"))
!inherits(rc, ErrorClass)
},
Expand All @@ -227,7 +227,7 @@ setMethod("dbRollback",
## return field names (no metadata)
setMethod("dbListFields",
signature(conn="PostgreSQLConnection", name="character"),
def = function(conn, name, ...){
definition = function(conn, name, ...){
qlength <- length(name)
if(qlength == 1){
currentschema <- dbGetQuery(conn, "SELECT current_schema()")
Expand Down Expand Up @@ -260,15 +260,15 @@ setMethod("dbListFields",


setMethod("dbCallProc", "PostgreSQLConnection",
def = function(conn, ...) .NotYetImplemented()
definition = function(conn, ...) .NotYetImplemented()
)

setMethod("dbCommit", "PostgreSQLConnection",
def = function(conn, ...) postgresqlTransactionStatement(conn, "COMMIT")
definition = function(conn, ...) postgresqlTransactionStatement(conn, "COMMIT")
)

setMethod("dbRollback", "PostgreSQLConnection",
def = function(conn, ...) {
definition = function(conn, ...) {
rsList <- dbListResults(conn)
if (length(rsList))
dbClearResult(rsList[[1]])
Expand All @@ -290,12 +290,12 @@ setAs("PostgreSQLResult", "PostgreSQLDriver",
)

setMethod("dbClearResult", "PostgreSQLResult",
def = function(res, ...) postgresqlCloseResult(res, ...),
definition = function(res, ...) postgresqlCloseResult(res, ...),
valueClass = "logical"
)

setMethod("fetch", signature(res="PostgreSQLResult", n="numeric"),
def = function(res, n, ...){
definition = function(res, n, ...){
out <- postgresqlFetch(res, n, ...)
if(is.null(out))
out <- data.frame(out)
Expand All @@ -306,7 +306,7 @@ setMethod("fetch", signature(res="PostgreSQLResult", n="numeric"),

setMethod("fetch",
signature(res="PostgreSQLResult", n="missing"),
def = function(res, n, ...){
definition = function(res, n, ...){
out <- postgresqlFetch(res, n=0, ...)
if(is.null(out))
out <- data.frame(out)
Expand All @@ -316,12 +316,12 @@ setMethod("fetch",
)

setMethod("dbGetInfo", "PostgreSQLResult",
def = function(dbObj, ...) postgresqlResultInfo(dbObj, ...),
definition = function(dbObj, ...) postgresqlResultInfo(dbObj, ...),
valueClass = "list"
)

setMethod("dbGetStatement", "PostgreSQLResult",
def = function(res, ...){
definition = function(res, ...){
st <- dbGetInfo(res, "statement")[[1]]
if(is.null(st))
st <- character()
Expand All @@ -332,7 +332,7 @@ setMethod("dbGetStatement", "PostgreSQLResult",

setMethod("dbListFields",
signature(conn="PostgreSQLResult", name="missing"),
def = function(conn, name, ...){
definition = function(conn, name, ...){
flds <- dbGetInfo(conn, "fields")$fields$name
if(is.null(flds))
flds <- character()
Expand All @@ -342,71 +342,71 @@ setMethod("dbListFields",
)

setMethod("dbColumnInfo", "PostgreSQLResult",
def = function(res, ...) postgresqlDescribeFields(res, ...),
definition = function(res, ...) postgresqlDescribeFields(res, ...),
valueClass = "data.frame"
)

setMethod("dbGetRowsAffected", "PostgreSQLResult",
def = function(res, ...) dbGetInfo(res, "rowsAffected")[[1]],
definition = function(res, ...) dbGetInfo(res, "rowsAffected")[[1]],
valueClass = "numeric"
)

setMethod("dbGetRowCount", "PostgreSQLResult",
def = function(res, ...) dbGetInfo(res, "rowCount")[[1]],
definition = function(res, ...) dbGetInfo(res, "rowCount")[[1]],
valueClass = "numeric"
)

setMethod("dbHasCompleted", "PostgreSQLResult",
def = function(res, ...) dbGetInfo(res, "completed")[[1]] == 1,
definition = function(res, ...) dbGetInfo(res, "completed")[[1]] == 1,
valueClass = "logical"
)

setMethod("dbGetException", "PostgreSQLResult",
def = function(conn, ...){
definition = function(conn, ...){
id <- as(conn, "integer")[1:2]
.Call(RS_PostgreSQL_getException, id)
},
valueClass = "list" ## TODO: should be a DBIException?
)

setMethod("summary", "PostgreSQLResult",
def = function(object, ...) postgresqlDescribeResult(object, ...)
definition = function(object, ...) postgresqlDescribeResult(object, ...)
)



setMethod("dbDataType",
signature(dbObj = "PostgreSQLObject", obj = "ANY"),
def = function(dbObj, obj, ...) postgresqlDataType(obj, ...),
definition = function(dbObj, obj, ...) postgresqlDataType(obj, ...),
valueClass = "character"
)


## MODIFIED : -- sameer
setMethod("make.db.names",
signature(dbObj="PostgreSQLObject", snames = "character"),
def = function(dbObj, snames,keywords,unique, allow.keywords,...){
definition = function(dbObj, snames,keywords,unique, allow.keywords,...){
postgresqlQuoteId(snames)
},
valueClass = "character"
)

setMethod("SQLKeywords", "PostgreSQLObject",
def = function(dbObj, ...) .PostgreSQLKeywords,
definition = function(dbObj, ...) .PostgreSQLKeywords,
valueClass = "character"
)

setMethod("isSQLKeyword",
signature(dbObj="PostgreSQLObject", name="character"),
def = function(dbObj, name,keywords,case, ...){
definition = function(dbObj, name,keywords,case, ...){
isSQLKeyword.default(name, keywords = .PostgreSQLKeywords)
},
valueClass = "character"
)
## extension to the DBI 0.1-4
setGeneric("dbApply", def = function(res, ...) standardGeneric("dbApply"))
setMethod("dbApply", "PostgreSQLResult",
def = function(res, ...) postgresqlDBApply(res, ...),
definition = function(res, ...) postgresqlDBApply(res, ...),
)


6 changes: 3 additions & 3 deletions RPostgreSQL/R/dbObjectId.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,16 +32,16 @@ setAs("dbObjectId", "character",

## formating, showing, printing,...
setMethod("format", "dbObjectId",
def = function(x, ...) {
definition = function(x, ...) {
paste("(", paste(as(x, "integer"), collapse=","), ")", sep="")
},
valueClass = "character"
)

setMethod("show", "dbObjectId", def = function(object) print(object))
setMethod("show", "dbObjectId", definition = function(object) print(object))

setMethod("print", "dbObjectId",
def = function(x, ...){
definition = function(x, ...){
expired <- if(isPostgresqlIdCurrent(x)) "" else "Expired "
str <- paste("<", expired, class(x), ":", format(x), ">", sep="")
cat(str, "\n")
Expand Down