isolating rJava

hrbrmstr · Jun 16, 2017 · f7248b2 · f7248b2
1 parent 41729ce
commit f7248b2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/R/jdbc.r b/R/jdbc.r
@@ -27,6 +27,10 @@
 #' }
 drill_jdbc <- function(nodes="localhost:2181", cluster_id=NULL, schema=NULL, use_zk=TRUE) {
 
+  if (!requireNamespace("rJava")) {
+    stop("RJDBC & rJava are required to use the Drill JDBC connectors", .call=FALSE)
+  }
+
   if (!requireNamespace("RJDBC")) {
     stop("RJDBC & rJava are required to use the Drill JDBC connectors", .call=FALSE)
   }

diff --git a/R/query.r b/R/query.r
@@ -24,6 +24,10 @@ drill_query <- function(drill_con, query, uplift=TRUE, .progress=interactive())
 
   if (inherits(drill_con, "JDBCConnection")) {
 
+    if (!requireNamespace("rJava")) {
+      stop("RJDBC & rJava are required to use the Drill JDBC connectors", .call=FALSE)
+    }
+
     if (!requireNamespace("RJDBC")) {
       stop("RJDBC & rJava are required to use the Drill JDBC connectors", .call=FALSE)
     }

diff --git a/R/zzz.R b/R/zzz.R
@@ -1,3 +1,3 @@
-.onLoad <- function(libname, pkgname) {
-  if (requireNamespace("rJava")) rJava::.jpackage(pkgname, lib.loc = libname)
-}
+# .onLoad <- function(libname, pkgname) {
+#   if (requireNamespace("rJava")) rJava::.jpackage(pkgname, lib.loc = libname)
+# }
diff --git a/man/DrillConnection-class.Rd b/man/DrillConnection-class.Rd