From d6e5fcf7f1b11dc9f2a112ae141ed4ad88a4e5e8 Mon Sep 17 00:00:00 2001 From: "Johan.Renaudie" Date: Thu, 16 Sep 2021 11:58:34 +0200 Subject: [PATCH] v2.2 switched to RPostgres to avoid the SHAM authentication issue --- CITATION.cff | 6 +++--- DESCRIPTION | 8 ++++---- NAMESPACE | 2 +- R/nsbConnect.R | 2 +- README.md | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/CITATION.cff b/CITATION.cff index 42b08aa..3c5356d 100644 --- a/CITATION.cff +++ b/CITATION.cff @@ -6,6 +6,6 @@ authors: orcid: https://orcid.org/0000-0002-9107-1984 title: "NSBcompanion: Functions to retrieve and manipulate data from the Neptune Database" -version: 2.1 -doi: 10.5281/zenodo.3408198 -date-released: 2019-07-11 +version: 2.2 +doi: +date-released: 2021-09-16 diff --git a/DESCRIPTION b/DESCRIPTION index 1d5e51b..2bfbfaa 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,12 +1,12 @@ Package: NSBcompanion Type: Package Title: Functions to retrieve and manipulate data from the Neptune Database (Lazarus, 1994) -Version: 2.1 -Date: 2019-07-11 +Version: 2.2 +Date: 2021-09-16 Author: Johan Renaudie Maintainer: Johan Renaudie Description: Some basic functions to retrieve data from Neptune, and a couple of other functions to deal with the preliminary quality control (outliers, synonyms). Basically mimic main functionalities of http://nsb-mfn-berlin.de. License: MIT URL: http://github.com/plannapus/NSB/NSBcompanion -Depends: RPostgreSQL -Imports: RPostgreSQL, stats, DBI +Depends: RPostgres +Imports: RPostgres, stats, DBI diff --git a/NAMESPACE b/NAMESPACE index 8dc3e59..3be58ef 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -1,4 +1,4 @@ exportPattern("^[^.].+") importFrom("stats", "approx") -import(RPostgreSQL) +import(RPostgres) import(DBI) diff --git a/R/nsbConnect.R b/R/nsbConnect.R index ce933e0..592d69a 100644 --- a/R/nsbConnect.R +++ b/R/nsbConnect.R @@ -1,5 +1,5 @@ nsbConnect <- function(username, password, intern=FALSE, local=FALSE){ host <- ifelse(local, "localhost", ifelse(intern, "192.168.101.133", "212.201.100.111")) - dbConnect(dbDriver("PostgreSQL"), user = username, password = password, host = host, dbname = "nsb", port = "5432") + dbConnect(Postgres(), user = username, password = password, host = host, dbname = "nsb", port = "5432") } diff --git a/README.md b/README.md index 03c19f9..28a7278 100644 --- a/README.md +++ b/README.md @@ -12,5 +12,5 @@ A minimal R package to retrieve data from Neptune Database Alternatively: - download.file("https://github.com/plannapus/NSBcompanion/releases/download/v2.1/NSBcompanion_2.1.tar.gz","NSBcompanion_2.1.tar.gz") - install.packages("NSBcompanion_2.1.tar.gz",repos=NULL,type="source") + download.file("https://github.com/plannapus/NSBcompanion/releases/download/v2.2/NSBcompanion_2.2.tar.gz","NSBcompanion_2.2.tar.gz") + install.packages("NSBcompanion_2.2.tar.gz",repos=NULL,type="source")