@@ -1,6 +1,6 @@

 Package: SQLDataFrame

 Title: Representation of SQL database in DataFrame metaphor

-Version: 1.10.0

+Version: 1.10.1

 Authors@R: c(

     person("Qian", "Liu", email = "qian.liu@roswellpark.org", role = c("aut", "cre"),

     comment = c(ORCID = "0000-0003-1456-5099")),

@@ -296,11 +296,11 @@ setGeneric("dbtable", signature = "x", function(x)

 setMethod("dbtable", "SQLDataFrame", function(x)

 {

-    op <- tblData(x)$ops

-    if (! is(op, "op_double")) {

+    op <- tblData(x)$lazy_query

+    if (! is(op, "lazy_set_op_query")) {

         out1 <- op$x

         repeat {

-            if (is(out1, "op_double")) {

+            if (is(out1, "lazy_set_op_query")) {

                 return(message(.msg_dbtable))

             } else if (is.ident(out1)) break

             out1 <- out1$x

@@ -370,8 +370,8 @@ select.SQLDataFrame <- function(.data, ...)

 {

     tbl <- .extract_tbl_from_SQLDataFrame_indexes(tblData(.data), .data)

     dots <- quos(...)

-    old_vars <- op_vars(tbl$ops)

-    new_vars <- tidyselect::vars_select(old_vars, !!!dots, .include = op_grps(tbl$ops))

+    old_vars <- op_vars(tbl$lazy_query)

+    new_vars <- tidyselect::vars_select(old_vars, !!!dots, .include = op_grps(tbl$lazy_query))

     .extractCOLS_SQLDataFrame(.data, new_vars)

 }

@@ -59,7 +59,7 @@ saveSQLDataFrame <- function(x,

                                  db_sql_render(con, tbl), con = con) 

             dbExecute(con, sql_cmd)

         } else {

-            if (is(tblData(x)$ops, "op_double")) ## from "*_join" or "union", etc

+            if (is(tblData(x)$lazy_query, "op_double")) ## from "*_join" or "union", etc

                 stop("Saving SQLDataFrame with lazy join / union queries ",

                      "from same non-writable MySQL database is not supported!")

             if (!.mysql_has_write_perm(localConn))

@@ -88,14 +88,14 @@ saveSQLDataFrame <- function(x,

                 stop("The 'dbname' already exists! Please provide a new value ",

                      "OR change 'overwrite = TRUE'. ")

         }

-        if (is(tblData(x)$ops, "op_base") ) {  

+        if (is(tblData(x)$lazy_query, "lazy_base_query")) {  

             con <- DBI::dbConnect(dbDriver("SQLite"), dbname = dbname)

             aux <- .attach_database(con, connSQLDataFrame(x)@dbname)

             tbl <- .open_tbl_from_connection(con, aux, x)  ## already

                                                             ## evaluated

                                                             ## ridx

                                                             ## here.

-        } else if (is(tblData(x)$ops, "op_double") | is(tblData(x)$ops, "op_single")) { 

+        } else if (is(tblData(x)$lazy_query, "lazy_set_op_query")) { 

             con <- connSQLDataFrame(x)

             tbl <- tblData(x)

             ## Since the "*_join", "union" function returns @indexes

@@ -120,7 +120,7 @@ saveSQLDataFrame <- function(x,

     ## This chunk applies to an input SQLDataFrame from "rbind"

     if (is(con, "SQLiteConnection")) {

-        if(is(tblData(x)$ops, "op_double") | is(tblData(x)$ops, "op_single")) {

+        if(is(tblData(x)$lazy_query, "lazy_set_op_query")) {

             file.copy(connSQLDataFrame(x)@dbname, dbname, overwrite = overwrite)

             sql_drop <- build_sql("DROP TABLE ", sql(dbtable), con = con)

             dbExecute(con, sql_drop)

@@ -38,11 +38,11 @@

 .join_union_prepare_sqlite <- function(x, y)

 {

-    if (is(tblData(x)$ops, "op_double") | is(tblData(x)$ops, "op_single")) {

-        ## may change: !is(tblData(x)$ops, "op_base")

+    if (is(tblData(x)$lazy_query, "lazy_set_op_query")) {

+        ## may change: !is(tblData(x)$lazy_query, "lazy_base_query")

         con <- connSQLDataFrame(x)

         tblx <- .open_tbl_from_connection(con, "main", x)

-        if (is(tblData(y)$ops, "op_double") | is(tblData(y)$ops, "op_single")) {

+        if (is(tblData(x)$lazy_query, "lazy_set_op_query")) {

                 ## attach all databases from y except "main", which is

                 ## temporary connection from "union" or "join"

                 dbs <- .dblist(con)

@@ -63,7 +63,7 @@

         } else {

             tbly <- .attachMaybe_and_open_tbl_in_new_connection(con, y)

         }

-    } else if (is(tblData(y)$ops, "op_double") | is(tblData(y)$ops, "op_single")) {

+    } else if (is(tblData(x)$lazy_query, "lazy_set_op_query")) {

         con <- connSQLDataFrame(y)

         tbly <- .open_tbl_from_connection(con, "main", y)

         tblx <- .attachMaybe_and_open_tbl_in_new_connection(con, x)

@@ -7,7 +7,7 @@ author:

   affiliation: Roswell Park Comprehensive Cancer Center, Buffalo, NY

 date: "last compiled: `r Sys.Date()`"

 output:

-    BiocStyle::html_document:

+    rmarkdown::html_document:

         toc: true

         toc_float: true

 package: SQLDataFrame

@@ -23,7 +23,7 @@ knitr::opts_chunk$set(

   comment = "#>"

 )

 ```

-date: "last edit: 9/30/2019"

+date: "last edit: 9/21/2022"

 [dbplyr]: https://cran.r-project.org/web/packages/dbplyr/index.html

@@ -7,7 +7,7 @@ author:

   affiliation: Roswell Park Comprehensive Cancer Center, Buffalo, NY

 date: "last compiled: `r Sys.Date()`"

 output:

-    BiocStyle::html_document:

+    rmarkdown::html_document:

         toc: true

         toc_float: true

 package: SQLDataFrame