Skip to content

Commit

Permalink
Regenerating documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
Schuemie authored and Schuemie committed Feb 11, 2022
1 parent b354c75 commit 8963235
Show file tree
Hide file tree
Showing 21 changed files with 47 additions and 23 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Package: DatabaseConnector
Type: Package
Title: Connecting to Various Database Platforms
Version: 5.0.2
Date: 2022-02-07
Date: 2022-02-11
Authors@R: c(
person("Martijn", "Schuemie", email = "[email protected]", role = c("aut", "cre")),
person("Marc", "Suchard", role = c("aut")),
Expand Down
1 change: 1 addition & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ importFrom(utils,download.file)
importFrom(utils,install.packages)
importFrom(utils,menu)
importFrom(utils,object.size)
importFrom(utils,packageVersion)
importFrom(utils,read.csv)
importFrom(utils,sessionInfo)
importFrom(utils,setTxtProgressBar)
Expand Down
2 changes: 1 addition & 1 deletion R/DatabaseConnector.R
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#' @keywords internal
"_PACKAGE"

#' @importFrom utils sessionInfo setTxtProgressBar txtProgressBar object.size write.csv write.table read.csv install.packages menu download.file unzip
#' @importFrom utils sessionInfo setTxtProgressBar txtProgressBar object.size write.csv write.table read.csv install.packages menu download.file unzip packageVersion
#' @importFrom bit64 integer64
#' @importFrom rlang warn abort inform
NULL
Expand Down
28 changes: 24 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,10 @@ DatabaseConnector

DatabaseConnector is part of [HADES](https://ohdsi.github.io/Hades/).


Introduction
============

This R package provides function for connecting to various DBMSs. Together with the `SqlRender` package, the main goal of `DatabaseConnector` is to provide a uniform interface across database platforms: the same code should run and produce equivalent results, regardless of the database back end.

Features
Expand All @@ -34,8 +36,10 @@ Features
- Supports the DBI interface
- Integrates with RStudio's Connections tab


Examples
========

```r
connectionDetails <- createConnectionDetails(dbms="postgresql",
server="localhost",
Expand All @@ -47,14 +51,19 @@ querySql(conn,"SELECT COUNT(*) FROM person")
disconnect(conn)
```


Technology
============

DatabaseConnector is an R package using Java's JDBC drivers.


System Requirements
===================

Running the package requires R with the package rJava installed. Also requires Java 1.8 or higher.


Installation
============

Expand All @@ -66,9 +75,9 @@ Installation
install.packages("DatabaseConnector")
```

3. Download the database drivers as described [here](http://ohdsi.github.io/DatabaseConnector/articles/Connecting.html#obtaining-drivers)
3. Download the database drivers as described [here](http://ohdsi.github.io/DatabaseConnector/articles/Connecting.html#obtaining-drivers).

4. (Optionally) To use Windows Authentication for SQL Server, download the authentication DDL file as described [here](http://ohdsi.github.io/DatabaseConnector/reference/connect.html#windows-authentication-for-sql-server-1)
4. (Optionally) To use Windows Authentication for SQL Server, download the authentication DDL file as described [here](http://ohdsi.github.io/DatabaseConnector/reference/connect.html#windows-authentication-for-sql-server-1).

User Documentation
==================
Expand All @@ -80,27 +89,38 @@ PDF versions of the documentation are also available:
* Vignette: [Querying a database](https://github.com/OHDSI/DatabaseConnector/raw/main/inst/doc/Querying.pdf)
* Package manual: [DatabaseConnector manual](https://raw.githubusercontent.com/OHDSI/DatabaseConnector/main/extras/DatabaseConnector.pdf)


Support
=======

* Developer questions/comments/feedback: <a href="http://forums.ohdsi.org/c/developers">OHDSI Forum</a>
* We use the <a href="https://github.com/OHDSI/DatabaseConnector/issues">GitHub issue tracker</a> for all bugs/issues/enhancements


Contributing
============

Read [here](https://ohdsi.github.io/Hades/contribute.html) how you can contribute to this package.


License
=======

DatabaseConnector is licensed under Apache License 2.0. The JDBC drivers [fall under their own respective licenses](https://raw.githubusercontent.com/OHDSI/DatabaseConnector/main/inst/COPYRIGHTS).


Development
===========

DatabaseConnector is being developed in R Studio.


### Development status

Stable. The code is actively being used in several projects.

# Acknowledgements
- This project is supported in part through the National Science Foundation grant IIS 1251151.

Acknowledgements
================

- This project is supported in part through the National Science Foundation grant IIS 1251151.
2 changes: 1 addition & 1 deletion cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
This update includes 7 changes and 2 bugfixes since 5.0.0 (see NEWS.md)
This update includes 8 changes and 2 bugfixes since 5.0.0 (see NEWS.md)

---

Expand Down
2 changes: 1 addition & 1 deletion docs/articles/Connecting.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/articles/Querying.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions docs/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions docs/news/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ pkgdown_sha: ~
articles:
Connecting: Connecting.html
Querying: Querying.html
last_built: 2022-02-09T07:58Z
last_built: 2022-02-11T05:36Z

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified extras/DatabaseConnector.pdf
Binary file not shown.
4 changes: 2 additions & 2 deletions extras/PackageMaintenance.R
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@ rmarkdown::render("vignettes/Querying.Rmd",
number_sections = TRUE))
unlink("inst/doc/Querying.tex")

# DBI 1.1.2 is causing an error when builing the package website, so downgrading to 1.1.0 for now:
# DBI 1.1.2 is causing an error when builing the package website, so downgrading to 1.1.1 for now:
require(devtools)
install_version("DBI", version = "1.1.0", repos = "http://cran.us.r-project.org")
install_version("DBI", version = "1.1.1", repos = "http://cran.us.r-project.org")
roxygen2::roxygenize('.', roclets = c('rd', 'collate', 'namespace'))

pkgdown::build_site()
Expand Down
Binary file modified inst/doc/Connecting.pdf
Binary file not shown.
Binary file modified inst/doc/Querying.pdf
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions man/dbListTables-DatabaseConnectorConnection-method.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 8963235

Please sign in to comment.