Skip to content

let dbSendQuery raise error if needed; return all cols for 0-row results #92

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
mmuurr wants to merge 2 commits into
base: master
Choose a base branch
from
Open

let dbSendQuery raise error if needed; return all cols for 0-row results #92

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
95685cc
let dbSendQuery raise error if needed; return all cols for 0-row results
mmuurr Sep 13, 2017
e2199a9
version bump
mmuurr Sep 13, 2017
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
6 changes: 3 additions & 3 deletions RPostgreSQL/DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Package: RPostgreSQL
Version: 0.6-2
Date: 2017-06-24
Version: 0.6-3
Date: 2017-09-13
Title: R Interface to the 'PostgreSQL' Database System
Author: Joe Conway, Dirk Eddelbuettel, Tomoaki Nishiyama, Sameer Kumar Prayaga (during 2008), Neil Tiffin
Author: Joe Conway, Dirk Eddelbuettel, Tomoaki Nishiyama, Sameer Kumar Prayaga (during 2008), Neil Tiffin, Murat Tasan
Maintainer: Tomoaki Nishiyama <tomoakin@staff.kanazawa-u.ac.jp>
Description: Database interface and 'PostgreSQL' driver for 'R'.
This package provides a Database Interface 'DBI' compliant
Expand Down
13 changes: 6 additions & 7 deletions RPostgreSQL/R/PostgreSQLSupport.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,11 +270,11 @@ postgresqlQuickSQL <- function(con, statement, ...) {
if (length(rsList)>0){ # clear results
dbClearResult(rsList[[1]])
}
rs <- try(dbSendQuery(con, statement, ...))
if (inherits(rs, ErrorClass)){
warning("Could not create execute: ", statement)
return(NULL)
}

## Let dbSendQuery raise an error if it cannot execute statement.
## (Surrounding code should be responsible for handling errors.)
rs <- dbSendQuery(con, statement, ...)

if(dbHasCompleted(rs)){
dbClearResult(rs) ## no records to fetch, we're done
invisible()
Expand Down Expand Up @@ -421,8 +421,7 @@ postgresqlFetch <- function(res, n=0, ...) {
n <- as(n, "integer")
rsId <- as(res, "integer")
rel <- .Call(RS_PostgreSQL_fetch, rsId, nrec = n)
if(length(rel)==0 || length(rel[[1]])==0)
return(NULL)

## create running row index as of previous fetch (if any)
cnt <- dbGetRowCount(res)
nrec <- length(rel[[1]])
Expand Down