Generate SQL 92 subqueries by default

These are always named. SQLite can use unnamed subqueries, which is simpler for testing SQL generation.

NAMESPACE

@@ -259,7 +259,7 @@ S3method(sql_render,tbl_sql)
 S3method(sql_select,default)
 S3method(sql_semi_join,default)
 S3method(sql_set_op,default)
-S3method(sql_subquery,PostgreSQLConnection)
+S3method(sql_subquery,SQLiteConnection)
 S3method(sql_subquery,default)
 S3method(sql_translate_env,"NULL")
 S3method(sql_translate_env,MySQLConnection)

R/sql-generic.R

@@ -68,15 +68,11 @@ sql_subquery <- function(con, from, name = random_table_name(), ...) {
   UseMethod("sql_subquery")
 }
 #' @export
-sql_subquery.default <- function(con, from, name = unique_name(), ...) {
-  if (is.ident(from)) {
-    setNames(from, name)
+sql_subquery.default <- function(con, sql, name = unique_name(), ...) {
+  if (is.ident(sql)) {
+    setNames(sql, name)
   } else {
-    if (is.null(name)) {
-      build_sql("(", from, ")", con = con)
-    } else {
-      build_sql("(", from, ") AS ", ident(name), con = con)
-    }
+    build_sql("(", sql, ") ", ident(name %||% random_table_name()), con = con)
   }
 }
 

R/src-postgres.r

@@ -143,17 +143,6 @@ sql_translate_env.PostgreSQLConnection <- function(con) {
   )
 }
 
-#' @export
-sql_subquery.PostgreSQLConnection <- function(con, sql, name = unique_name(), ...) {
-
-  if (is.ident(sql)) {
-    setNames(sql, name)
-  } else {
-    build_sql("(", sql, ") ", ident(name %||% random_table_name()), con = con)
-  }
-}
-
-
 # DBI methods ------------------------------------------------------------------
 
 # Doesn't return TRUE for temporary tables

R/src-sqlite.r

@@ -172,6 +172,19 @@ sql_escape_ident.SQLiteConnection <- function(con, x) {
   sql_quote(x, '`')
 }
 
+#' @export
+sql_subquery.SQLiteConnection <- function(con, from, name = unique_name(), ...) {
+  if (is.ident(from)) {
+    setNames(from, name)
+  } else {
+    if (is.null(name)) {
+      build_sql("(", from, ")", con = con)
+    } else {
+      build_sql("(", from, ") AS ", ident(name), con = con)
+    }
+  }
+}
+
 
 # DBI methods ------------------------------------------------------------------