Respond to CRAN comments.

clean up code a bit more.

Author: JohnMount

DESCRIPTION

@@ -9,13 +9,13 @@ Authors@R: c(
     )
 Maintainer: John Mount <[email protected]>
 URL: https://github.com/WinVector/rquery/, https://winvector.github.io/rquery/
-Description: Supplies a query generator based on Edgar F. Codd's relational
-    algebra and operator names (plus experience using SQL at big data
-    scale).  The design is an attempt to make SQL more teachable by
+Description: A query generator based on Edgar F. Codd's relational
+    algebra and operator names (plus experience using 'SQL' at big data
+    scale).  The design represents an attempt to make 'SQL' more teachable by
     denoting composition a sequential pipeline notation instead of nested
     queries or functions.  Package features include: data processing trees
     or pipelines as observable objects (able to report both columns
-    produced and columns used), optimized SQL generation as an explicit
+    produced and columns used), optimized 'SQL' generation as an explicit
     user visible modeling step, and convenience methods for applying query
     trees to in-memory data.frames.
 License: GPL-3

R/package.R

@@ -3,12 +3,12 @@
 #' \code{rquery}: Relational Query Generator for Data Manipulation
 #'
 #' \code{rquery} supplies a query generator based on Edgar F. Codd's relational
-#' algebra and operator names (plus experience using SQL at big data
-#' scale).  The design is an attempt to make SQL more teachable by
+#' algebra and operator names (plus experience using \code{SQL} at big data
+#' scale).  The design represents an attempt to make \code{SQL} more teachable by
 #' denoting composition a sequential pipeline notation instead of nested
 #' queries or functions.  Package features include: data processing trees
 #' or pipelines as observable objects (able to report both columns
-#' produced and columns used), optimized SQL generation as an explicit
+#' produced and columns used), optimized \code{SQL} generation as an explicit
 #' user visible modeling step, and convenience methods for applying query
 #' trees to in-memory data.frames.
 #'

R/pre_sql.R

@@ -44,6 +44,9 @@ pre_sql_string <- function(value) {
 #' represents a string constant
 #'   value character string
 #'
+#' @param value character, token string
+#' @return pre_sql_token class
+#'
 #' @noRd
 #'
 pre_sql_token <- function(value) {
@@ -57,6 +60,9 @@ pre_sql_token <- function(value) {
 #'
 #' represents an expression.  Unnamed list of pre_sql_terms and character.
 #'
+#' @param terms character, term vector
+#' @return pre_sql_expr class
+#'
 #' @noRd
 #'
 pre_sql_expr <- function(terms) {
@@ -88,6 +94,7 @@ pre_sql_expr <- function(terms) {
 #'
 #' @param tablename characer name of table
 #' @param columns character column names
+#' @return pre_sql table details
 #'
 #' @noRd
 #'
@@ -144,6 +151,16 @@ format.pre_sql_token <- function(x, ...) {
   paste(as.character(x$value), collapse = " ")
 }
 
+#' Convert a pre_sql token object to SQL query text.
+#'
+#' @param x the pre_sql token
+#' @param db_info representation of the database to convert to
+#' @param ... force later arguments to be by name
+#' @param source_table concrete table for query
+#' @param source_limit numeric limit on rows from this source table
+#' @param using TBD
+#' @return SQL query text
+#'
 #' @noRd
 #'
 to_query.pre_sql_token <- function (x,
@@ -170,7 +187,16 @@ to_query.pre_sql_token <- function (x,
   paste(as.character(x$value), collapse = " ")
 }
 
-
+#' Convert a pre_sql expr object to SQL query text.
+#'
+#' @param x the pre_sql expr
+#' @param db_info representation of the database to convert to
+#' @param ... force later arguments to be by name
+#' @param source_table concrete table for query
+#' @param source_limit numeric limit on rows from this source table
+#' @param using TBD
+#' @return SQL query text
+#'
 #' @noRd
 #'
 to_query.pre_sql_expr <- function (x,
@@ -270,6 +296,15 @@ place_subqs <- function (x,
   UseMethod("place_subqs", x)
 }
 
+#' Convert a pre_sql op object to SQL query text.
+#'
+#' @param x the pre_sql op
+#' @param db_info representation of the database to convert to
+#' @param subqs subqueries
+#' @param ... force later arguments to be by name
+#' @param source_limit numeric limit on rows from this source table
+#' @param using TBD
+#' @return SQL query text
 #'
 #' @noRd
 #'
@@ -285,7 +320,16 @@ place_subqs.pre_sql_op <- function (x,
   subqs[[1]]
 }
 
-
+#' Convert a pre_sql op object to SQL query text.
+#'
+#' @param x the pre_sql op
+#' @param db_info representation of the database to convert to
+#' @param ... force later arguments to be by name
+#' @param source_table concrete table for query
+#' @param source_limit numeric limit on rows from this source table
+#' @param using TBD
+#' @return SQL query text
+#'
 #' @noRd
 #'
 to_query.pre_sql_op <- function (x,

README.Rmd

@@ -188,10 +188,6 @@ We also can stand `rquery` up on non-`DBI` sources such as [`SparkR`](https://gi
 and perhaps even [`data.table`](https://github.com/WinVector/rquery/blob/master/extras/data_table.md).
 
 
-# Conclusion
-
-`rquery` is still in early development (and not yet ready for extensive use in production), but it is maturing fast. Our current intent is to bring in sponsors, partners, and R community voices to help develop and steer rquery.
-
 
 ```{r cleanup, include=FALSE}
 if(use_spark) {

README.md

@@ -226,8 +226,3 @@ cat(format(dq))
      orderby(., subjectID)
 
 We also can stand `rquery` up on non-`DBI` sources such as [`SparkR`](https://github.com/WinVector/rquery/blob/master/extras/SparkRExample.md) and perhaps even [`data.table`](https://github.com/WinVector/rquery/blob/master/extras/data_table.md).
-
-Conclusion
-==========
-
-`rquery` is still in early development (and not yet ready for extensive use in production), but it is maturing fast. Our current intent is to bring in sponsors, partners, and R community voices to help develop and steer rquery.

cran-comments.md

@@ -1,4 +1,5 @@
 
+Re-submitted with corrected spelling (entities in single quotes) in DESCRIPTION as requested.
 
 ## Test environments
 
@@ -32,4 +33,4 @@ New package, now reverse dependencies.
      devtools::revdep()
      character(0)
      
-Note: "Edgar F. Codd"" and "observable" are both spelled correctly.
+Note: "Edgar F. Codd", "SQL", and "observable" are all spelled correctly.

docs/articles/AdHocQueries.html

@@ -16,6 +16,7 @@ knitr::opts_chunk$set(
 )
 ```
 
+The primary purpose of `rquery` is `SQL` query generation.  We demonstrate this below.
 
 ```{r ex, warning=FALSE, message=FALSE, include=FALSE}
 library("rquery")