瀏覽代碼

Lisatud 'construct_ogr2ogr_PG_connect_str' argument schema.

Ardo Kubjas 5 年之前
父節點
當前提交
fe78f03fa6
共有 2 個文件被更改,包括 19 次插入13 次删除
  1. 12 8
      R/construct_ogr2ogr_PG_connect_str.R
  2. 7 5
      man/construct_ogr2ogr_PG_connect_str.Rd

+ 12 - 8
R/construct_ogr2ogr_PG_connect_str.R

@@ -7,14 +7,18 @@
 #' @keywords ogr2ogr, postgis
 #' @export
 #' @examples
-#' ## Not run:
-#' ##
-#' ## construct_ogr2ogr_PG_connect_str()
-#' ##
-#' ## End(**Not run**)
+#'
+#' \dontrun{
+#'
+#' conf <- ruut::get_config()
+#' construct_ogr2ogr_PG_connect_str(conf = conf)
+#'
+#' }
 construct_ogr2ogr_PG_connect_str <- function(conf = NULL) {
-  if(is.null(conf)) conf <- ruut::get_config()
-  PG <- sprintf("\"PG:dbname='%s' host=%s port=%d user='%s' password='%s' sslmode=%s\"",
-                conf$dbname, conf$host, conf$port, conf$user, conf$password, conf$sslmode)
+  if (is.null(conf)) conf <- ruut::get_config()
+  PG <- sprintf(
+    "\"PG:dbname='%s' host=%s port=%d user='%s' password='%s' sslmode=%s active_schema=%s\" ",
+    conf$dbname, conf$host, conf$port, conf$user, conf$password, conf$sslmode, conf$schema
+  )
   PG
 }

+ 7 - 5
man/construct_ogr2ogr_PG_connect_str.Rd

@@ -16,11 +16,13 @@ A string '"PG:dbname='\%s' host=\%s port=\%d user='\%s' password='\%s' sslmode=\
 See funktsioon konstrueerib 'ogr2ogr' käsus kasutatava fraasi, mis on vajalik andmebaasiga ühendamisegs. Fraasi algparameetrid võetakse konfiguratsioonifailist ruut::get_config().
 }
 \examples{
-## Not run:
-##
-## construct_ogr2ogr_PG_connect_str()
-##
-## End(**Not run**)
+
+\dontrun{
+
+conf <- ruut::get_config()
+construct_ogr2ogr_PG_connect_str(conf = conf)
+
+}
 }
 \seealso{
 \code{\link[=db_connect]{db_connect()}}, \code{\link[=get_config]{get_config()}}