#29 specify data sql

r-geoflow · Oct 22, 2019 · ffcdb03 · ffcdb03
1 parent 56a2cca
commit ffcdb03
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/R/geoflow_action_geosapi_publish_ogc_services.R b/R/geoflow_action_geosapi_publish_ogc_services.R
@@ -129,7 +129,7 @@ geosapi_publish_ogc_services <- function(entity, config, options){
   if(entity$data$uploadType == "dbquery"){
     vt <- GSVirtualTable$new()
     vt$setName(entity$identifiers$id)
-    vt$setSql(datasource)
+    vt$setSql(entity$data$sql)
     #if the virtual table is spatialized
     if(!is.null(entity$data$geometryField) & !is.null(entity$data$geometryType)){
       vtg <- GSVirtualTableGeometry$new(

diff --git a/R/geoflow_data.R b/R/geoflow_data.R
@@ -6,6 +6,7 @@ geoflow_data <- R6Class("geoflow_data",
   ),
   public = list(
     source = NULL,
+    sql = NULL,
     upload = TRUE,
     uploadType = "other",
     uploadZip = FALSE,
@@ -71,6 +72,11 @@ geoflow_data <- R6Class("geoflow_data",
         }
         self$setSource(data_props$source$values)
 
+        #sql
+        if(!is.null(data_props$sql)){
+          self$setSql(data_props$sql$values[[1]])
+        }
+
         #layername (if any)
         #not mandatory, can be used for subset layers
         if(!is.null(data_props$layername)){
@@ -172,6 +178,11 @@ geoflow_data <- R6Class("geoflow_data",
       self$source <- source
     },
 
+    #setSql
+    setSql = function(sql){
+      self$sql <- sql
+    },
+
     #setCqlFilter
     setCqlFilter = function(cqlfilter){
       self$cqlfilter <- cqlfilter