rebuild and recheck

Author: JohnMount

NEWS.md

@@ -1,8 +1,9 @@
 
 # rquery 1.3.8 2019/09/15
 
- * YAML path.
+ * Add YAML path for operator trees.
  * Auto-register rqdatatable as default executor on load, if available.
+ * Fix column name quoting issue in operator presentation.
  * Alternate operator names.
 
 # rquery 1.3.7 2019/07/29

R/extend.R

@@ -330,32 +330,28 @@ format_node.relop_extend <- function(node) {
   if(!is.null(node$display_form)) {
     return(node$display_form)
   }
-  pterms <- ""
-  if(length(node$partitionby)>0) {
-    pterms <- paste0(",\n  p= ",
-                     paste(node$partitionb, collapse = ", "))
-  }
-  oterms <- ""
-  ocols <- NULL
-  if(length(node$orderby)>0) {
-    ocols <- paste0("\"", node$orderby, "\"")
-    if(length(node$reverse)>0) {
-      ocols[node$orderby %in% node$reverse] <- paste(ocols[node$orderby %in% node$reverse], "DESC")
-    }
-  }
-  if(length(ocols)>0) {
-    oterms <- paste0(",\n  o= ",
-      paste(ocols, collapse = ", "))
-  }
   origTerms <- vapply(node$parsed,
                       function(pi) {
                         paste(as.character(pi$presentation), collapse = ' ')
                       }, character(1))
   aterms <- paste(origTerms, collapse = ",\n  ")
+  pterms <- ""
+  oterms <- ""
+  rterms <- ""
+  if(length(node$partitionby)>0) {
+    pterms <- paste0(",\n  partitionby = ", wrapr::map_to_char(node$partitionby))
+  }
+  if(length(node$partitionby)>0) {
+    oterms <- paste0(",\n  orderby = ", wrapr::map_to_char(node$orderby))
+  }
+  if(length(node$partitionby)>0) {
+    rterms <- paste0(",\n  reverse = ", wrapr::map_to_char(node$reverse))
+  }
   paste0("extend(.,\n  ",
          aterms,
          pterms,
          oterms,
+         rterms,
          ")",
          "\n")
 }

R/natural_join.R

@@ -178,10 +178,10 @@ format.relop_natural_join <- function(x, ...) {
          " %.>%\n ",
          "natural_join(.,\n",
          "  ", b, ",\n",
-         "  j= ",
+         "  jointype = \"",
          x$jointype,
-         ", by= ",
-         paste(x$by, collapse = ", "),
+         "\", by = ",
+         wrapr::map_to_char(x$by),
          ")",
          "\n")
 }

R/order_by.R

@@ -110,18 +110,10 @@ orderby.data.frame <- function(source,
 
 #' @export
 format_node.relop_orderby <- function(node) {
-  ot <- node$orderby
-  if(length(node$reverse)>0) {
-    ot[ot %in% node$reverse] <- paste0("desc(", ot[ot %in% node$reverse], ")")
-  }
-  paste0("orderby(., ",
-         ifelse(length(ot)>0,
-                paste(ot, collapse = ", "),
-                ""),
-         ifelse((length(node$limit)>0) && (length(node$orderby)>0),
-                paste0(", LIMIT ",
-                       format(ceiling(node$limit), scientific = FALSE)),
-                ""),
+  paste0("order_rows(.",
+         ",\n  ", wrapr::map_to_char(node$orderby),
+         ",\n  reverse = ", wrapr::map_to_char(node$reverse),
+         ",\n  limit = ", ifelse(is.null(node$limit), "NULL", node$limit),
          ")",
          "\n")
 }

R/project.R

@@ -220,8 +220,7 @@ format_node.relop_project <- function(node) {
   aterms <- paste(origTerms, collapse = ", ")
   paste0("project(., ",
          aterms,
-         ",\n  g= ",
-         paste(node$groupby, collapse = ", "),
+         ",\n  groupby = ", wrapr::map_to_char(node$groupby),
          ")",
          "\n")
 }

R/select_columns.R

@@ -70,9 +70,10 @@ column_names.relop_select_columns <- function (x, ...) {
 
 #' @export
 format_node.relop_select_columns <- function(node) {
-  paste0("select_columns(.,\n   ",
-         paste(node$columns, collapse = ", "),
-         ")",
+  cols <- paste0('"', node$columns, '"')
+  paste0("select_columns(., c(\n   ",
+         paste(cols, collapse = ", "),
+         "))",
          "\n")
 }
 

R/table_source.R

@@ -338,13 +338,13 @@ to_sql_relop_table_source <- function(
 #' @export
 format_node.relop_table_source <- function(node) {
   max_cols <- 20
-  cols <- node$columns
+  cols <- paste0('"', node$columns, '"')
   if(length(cols)>max_cols) {
     cols <- c(cols[seq_len(max_cols)], "...")
   }
-  paste0("table(", node$q_table_name, "; \n  ",
+  paste0("mk_td(\"", node$q_table_name, "\", c(\n  ",
          paste(cols, collapse = ",\n  "),
-         ")\n")
+         "))\n")
 }
 
 

README.md

@@ -228,7 +228,7 @@ rq_copy_to(db, 'd',
             overwrite = TRUE)
 ```
 
-    ## [1] "table(\"d\"; subjectID, surveyCategory, assessmentTotal, irrelevantCol1, irrelevantCol2)"
+    ## [1] "mk_td(\"\"d\"\", c( \"subjectID\", \"surveyCategory\", \"assessmentTotal\", \"irrelevantCol1\", \"irrelevantCol2\"))"
 
 ``` r
 # produce a hande to existing table
@@ -279,7 +279,7 @@ class(d)
 print(d)
 ```
 
-    ## [1] "table(\"d\"; subjectID, surveyCategory, assessmentTotal, irrelevantCol1, irrelevantCol2)"
+    ## [1] "mk_td(\"\"d\"\", c( \"subjectID\", \"surveyCategory\", \"assessmentTotal\", \"irrelevantCol1\", \"irrelevantCol2\"))"
 
 ``` r
 # remote structure inspection
@@ -350,7 +350,7 @@ class(result)
 result
 ```
 
-    ## [1] "table(\"rquery_mat_46472544534830976230_0000000000\"; subjectID, diagnosis, probability)"
+    ## [1] "mk_td(\"\"rquery_mat_72197415925085797270_0000000000\"\", c( \"subjectID\", \"diagnosis\", \"probability\"))"
 
 ``` r
 DBI::dbReadTable(db$connection, result$table_name) %.>%
@@ -430,14 +430,14 @@ cat(to_sql(dq, db, source_limit = 1000))
             "assessmentTotal"
            FROM
             "d" LIMIT 1000
-           ) tsql_95158266591829713371_0000000000
-          ) tsql_95158266591829713371_0000000001
-         ) tsql_95158266591829713371_0000000002
-       ) tsql_95158266591829713371_0000000003
+           ) tsql_14421193931461477387_0000000000
+          ) tsql_14421193931461477387_0000000001
+         ) tsql_14421193931461477387_0000000002
+       ) tsql_14421193931461477387_0000000003
        WHERE "row_number" <= 1
-      ) tsql_95158266591829713371_0000000004
-     ) tsql_95158266591829713371_0000000005
-    ) tsql_95158266591829713371_0000000006 ORDER BY "subjectID"
+      ) tsql_14421193931461477387_0000000004
+     ) tsql_14421193931461477387_0000000005
+    ) tsql_14421193931461477387_0000000006 ORDER BY "subjectID"
 
 The query is large, but due to its regular structure it should be very
 amenable to query optimization.
@@ -485,28 +485,34 @@ The flow itself is represented as follows:
 cat(format(dq))
 ```
 
-    table("d"; 
-      subjectID,
-      surveyCategory,
-      assessmentTotal,
-      irrelevantCol1,
-      irrelevantCol2) %.>%
+    mk_td(""d"", c(
+      "subjectID",
+      "surveyCategory",
+      "assessmentTotal",
+      "irrelevantCol1",
+      "irrelevantCol2")) %.>%
      extend(.,
       probability := exp(assessmentTotal * 0.237)) %.>%
      extend(.,
       probability := probability / sum(probability),
-      p= subjectID) %.>%
+      partitionby = c('subjectID'),
+      orderby = c(),
+      reverse = c()) %.>%
      extend(.,
       row_number := row_number(),
-      p= subjectID,
-      o= "probability" DESC, "surveyCategory") %.>%
+      partitionby = c('subjectID'),
+      orderby = c('probability', 'surveyCategory'),
+      reverse = c('probability')) %.>%
      select_rows(.,
        row_number <= 1) %.>%
-     rename(.,
+     rename_columns(.,
       c('diagnosis' = 'surveyCategory')) %.>%
-     select_columns(.,
-       subjectID, diagnosis, probability) %.>%
-     orderby(., subjectID)
+     select_columns(., c(
+       "subjectID", "diagnosis", "probability")) %.>%
+     order_rows(.,
+      c('subjectID'),
+      reverse = c(),
+      limit = NULL)
 
 ``` r
 dq %.>%

cran-comments.md

@@ -4,14 +4,14 @@
 
 ### OSX (local machine using --as-cran from the command line)
 
-    R CMD check --as-cran rquery_1.3.7.tar.gz
+    R CMD check --as-cran rquery_1.3.8.tar.gz
     * using R version 3.6.0 (2019-04-26)
     * using platform: x86_64-apple-darwin15.6.0 (64-bit)
     * using session charset: UTF-8
     * using option ‘--as-cran’
     * checking for file ‘rquery/DESCRIPTION’ ... OK
     * checking extension type ... Package
-    * this is package ‘rquery’ version ‘1.3.7’
+    * this is package ‘rquery’ version ‘1.3.8’
     * package encoding: UTF-8
     * checking CRAN incoming feasibility ... Note_to_CRAN_maintainers
     Maintainer: ‘John Mount <[email protected]>’
@@ -20,24 +20,20 @@
 ### Windows
 
     rhub::check_for_cran()
-    822#> * using R Under development (unstable) (2019-07-04 r76780)
-    823#> * using platform: x86_64-w64-mingw32 (64-bit)
-    824#> * using session charset: ISO8859-1
-    825#> * using option '--as-cran'
-    826#> * checking for file 'rquery/DESCRIPTION' ... OK
-    827#> * checking extension type ... Package
-    828#> * this is package 'rquery' version '1.3.7'
-    829#> * package encoding: UTF-8
-    830#> * checking CRAN incoming feasibility ... Note_to_CRAN_maintainers
-    831#> Maintainer: 'John Mount '
-    885#> * DONE
-    886#> Status: OK
+    831#> * using R Under development (unstable) (2019-08-30 r77101)
+    832#> * using platform: x86_64-w64-mingw32 (64-bit)
+    833#> * using session charset: ISO8859-1
+    834#> * using option '--as-cran'
+    835#> * checking for file 'rquery/DESCRIPTION' ... OK
+    836#> * checking extension type ... Package
+    837#> * this is package 'rquery' version '1.3.8'
+    838#> * package encoding: UTF-8
+    839#> * checking CRAN incoming feasibility ... Note_to_CRAN_maintainers
+    840#> Maintainer: 'John Mount '
+    896#> Status: OK
 
 ## Reverse dependencies
 
     Checked https://github.com/WinVector/rquery/blob/master/extras/check_reverse_dependencies.md
-    ## cdata_1.1.1 started at 2019-07-29 09:21:48 success at 2019-07-29 09:22:22 (1/0/0) 
-    ## rqdatatable_1.1.9 started at 2019-07-29 09:22:22 success at 2019-07-29 09:22:53 (2/0/0)
-    ## Test of rquery had 2 successes, 0 failures, and 0 skipped packages. 
 
 Note: "Edgar F. Codd", "SQL", and "observable" are all spelled correctly.