Adds Spark dialect (without updated SqlRender JAR file)

.gitignore

@@ -12,3 +12,4 @@ standalone/build/*
 .idea
 *.iml
 errorReportSql.txt
+.DS_Store

DESCRIPTION

@@ -1,30 +1,30 @@
-Package: SqlRender
-Type: Package
-Title: Rendering Parameterized SQL and Translation to Dialects
-Version: 1.7.0
-Date: 2021-03-01
-Authors@R: c(
-  person("Martijn", "Schuemie", , "[email protected]", role = c("aut", "cre")),
-  person("Marc", "Suchard", role = c("aut"))
-  )
-Maintainer: Martijn Schuemie <[email protected]>
-Description: A rendering tool for parameterized SQL that also translates into
-  different SQL dialects.  These dialects include 'Microsoft Sql Server', 'Oracle', 
-  'PostgreSql', 'Amazon RedShift', 'Apache Impala', 'IBM Netezza', 'Google BigQuery', 'Microsoft PDW', and 'SQLite'.
-SystemRequirements: Java version 8 or higher (https://www.java.com/)
-License: Apache License 2.0
-VignetteBuilder: knitr
-URL: https://ohdsi.github.io/SqlRender/, https://github.com/OHDSI/SqlRender
-BugReports: https://github.com/OHDSI/SqlRender/issues
-Imports:
-  rJava,
-  rlang
-Suggests:
-  testthat,
-  knitr,
-  rmarkdown,
-  shiny,
-  shinydashboard
-LazyData: false
-RoxygenNote: 7.1.1
-Encoding: UTF-8
+Package: SqlRender
+Type: Package
+Title: Rendering Parameterized SQL and Translation to Dialects
+Version: 1.7.0
+Date: 2021-03-01
+Authors@R: c(
+  person("Martijn", "Schuemie", , "[email protected]", role = c("aut", "cre")),
+  person("Marc", "Suchard", role = c("aut"))
+  )
+Maintainer: Martijn Schuemie <[email protected]>
+Description: A rendering tool for parameterized SQL that also translates into
+  different SQL dialects.  These dialects include 'Microsoft Sql Server', 'Oracle', 
+  'PostgreSql', 'Amazon RedShift', 'Apache Impala', 'IBM Netezza', 'Google BigQuery', 'Microsoft PDW', 'Apache Spark', and 'SQLite'.
+SystemRequirements: Java version 8 or higher (https://www.java.com/)
+License: Apache License 2.0
+VignetteBuilder: knitr
+URL: https://ohdsi.github.io/SqlRender/, https://github.com/OHDSI/SqlRender
+BugReports: https://github.com/OHDSI/SqlRender/issues
+Imports:
+  rJava,
+  rlang
+Suggests:
+  testthat,
+  knitr,
+  rmarkdown,
+  shiny,
+  shinydashboard
+LazyData: false
+RoxygenNote: 7.1.1
+Encoding: UTF-8

NEWS.md

@@ -9,6 +9,8 @@ Changes:
 
 3. Updated `createRWrapperForSql()` to latest SqlRender standards.
 
+4. Added Apache Spark dialect ("spark")
+
 Bugfixes:
 
 1. Fixed translation of CTE without FROM or UNION in BigQuery. 

R/HelperFunctions.R

@@ -113,7 +113,7 @@ renderSqlFile <- function(sourceFile, targetFile, warnOnMissingParameters = TRUE
 #' @param sourceFile            The source SQL file
 #' @param targetFile            The target SQL file
 #' @param targetDialect         The target dialect. Currently "oracle", "postgresql", "pdw", "impala",
-#'                              "sqlite", "netezza", "bigquery", and "redshift" are supported.
+#'                              "sqlite", "netezza", "bigquery", "spark", and "redshift" are supported.
 #' @param oracleTempSchema      DEPRECATED: use \code{tempEmulationSchema} instead.
 #' @param tempEmulationSchema   Some database platforms like Oracle and Impala do not truly support
 #'                              temp tables. To emulate temp tables, provide a schema with write

R/RenderSql.R

@@ -118,7 +118,7 @@ renderSql <- function(sql = "", warnOnMissingParameters = TRUE, ...) {
 #'
 #' @param sql                   The SQL to be translated
 #' @param targetDialect         The target dialect. Currently "oracle", "postgresql", "pdw", "impala",
-#'                              "sqlite", "netezza", "bigquery", and "redshift" are supported.
+#'                              "sqlite", "netezza", "bigquery", "spark", and "redshift" are supported.
 #' @param oracleTempSchema      DEPRECATED: use \code{tempEmulationSchema} instead.
 #' @param tempEmulationSchema   Some database platforms like Oracle and Impala do not truly support
 #'                              temp tables. To emulate temp tables, provide a schema with write
@@ -163,7 +163,7 @@ translate <- function(sql = "",
 #'
 #' @param sql                The SQL to be translated
 #' @param targetDialect      The target dialect. Currently "oracle", "postgresql", "pdw", "impala",
-#'                           "netezza", "bigquery", and "redshift" are supported
+#'                           "netezza", "bigquery", "spark", and "redshift" are supported
 #' @param oracleTempSchema   A schema that can be used to create temp tables in when using Oracle or
 #'                           Impala.
 #'
@@ -192,7 +192,7 @@ translateSql <- function(sql = "", targetDialect, oracleTempSchema = NULL) {
 #'
 #' @param sql                   The SQL to be translated
 #' @param targetDialect         The target dialect. Currently "oracle", "postgresql", "pdw", "impala",
-#'                              "sqlite", "netezza", "bigquery", and "redshift" are supported.
+#'                              "sqlite", "netezza", "bigquery", "spark", and "redshift" are supported.
 #' @param oracleTempSchema      DEPRECATED: use \code{tempEmulationSchema} instead.
 #' @param tempEmulationSchema   Some database platforms like Oracle and Impala do not truly support
 #'                              temp tables. To emulate temp tables, provide a schema with write

README.md

@@ -17,7 +17,7 @@ Features
 - Supports a simple markup syntax for making SQL parameterized, and renders parameterized SQL (containing the markup syntax) to executable SQL
 - The syntax supports defining default parameter values
 - The syntax supports if-then-else structures
-- Has functions for translating SQL from one dialect (Microsoft SQL Server) to other dialects (Oracle, PostgreSQL, Amazon RedShift, Impala, IBM Netezza, Google BigQuery, Microsoft PDW, and SQLite)
+- Has functions for translating SQL from one dialect (Microsoft SQL Server) to other dialects (Oracle, PostgreSQL, Amazon RedShift, Impala, IBM Netezza, Google BigQuery, Microsoft PDW, Apache Spark, and SQLite)
 - Can be used as R package, Java library, or as stand-alone executable through a command-line interface
 
 Examples

SqlRender.Rproj

@@ -1,18 +1,18 @@
-Version: 1.0
-
-RestoreWorkspace: No
-SaveWorkspace: No
-AlwaysSaveHistory: No
-
-EnableCodeIndexing: Yes
-UseSpacesForTab: Yes
-NumSpacesForTab: 2
-Encoding: UTF-8
-
-RnwWeave: knitr
-LaTeX: pdfLaTeX
-
-BuildType: Package
-PackageInstallArgs: --with-keep.source
-PackageCheckArgs: --as-cran
-PackageRoxygenize: rd,collate,namespace
+Version: 1.0
+
+RestoreWorkspace: No
+SaveWorkspace: No
+AlwaysSaveHistory: No
+
+EnableCodeIndexing: Yes
+UseSpacesForTab: Yes
+NumSpacesForTab: 2
+Encoding: UTF-8
+
+RnwWeave: knitr
+LaTeX: pdfLaTeX
+
+BuildType: Package
+PackageInstallArgs: --with-keep.source
+PackageCheckArgs: --as-cran
+PackageRoxygenize: rd,collate,namespace