Fix check for managed instance and update version number (#69)

R/DESCRIPTION

@@ -1,7 +1,7 @@
 Package: sqlmlutils
 Type: Package
 Title: Wraps R code into executable SQL Server stored procedures
-Version: 0.7.1
+Version: 0.7.2
 Author: Microsoft Corporation
 Maintainer: Microsoft Corporation <msrpack@microsoft.com>
 Depends:
@@ -13,7 +13,7 @@ Description: sqlmlutils is a package designed to help users interact with SQL Se
              creating and running stored procedures, and managing packages on the database.
 License: MIT + file LICENSE
 Copyright: Copyright 2016 Microsoft Corporation
-RoxygenNote: 6.1.1
+RoxygenNote: 7.1.0
 Encoding: UTF-8
 Suggests: testthat (>= 2.0.0),
     roxygen2

R/R/sqlPackage.R

@@ -785,7 +785,7 @@ sqlPackageManagementVersion <- function(connectionString)
         stop(sprintf("Failed to get SQL version using connection string '%s'", connectionString ), call. = FALSE)
     }
 
-    if(serverProperties[["edition"]] == "sql azure" && serverProperties[["engineEdition"]]==5)
+    if(serverProperties[["edition"]] == "sql azure" && (serverProperties[["engineEdition"]]==5 || serverProperties[["engineEdition"]]==8))
     {
         # sql azure
         pmversion <- append(list(serverType = "azure"), tail(serverProperties, -2))

R/README.md

@@ -8,7 +8,7 @@ sqlmlutils is an R package to help execute R code on a SQL database (SQL Server
 From command prompt, run 
 ```
 R.exe -e "install.packages('RODBCext', repos='https://mran.microsoft.com/snapshot/2019-02-01/')"
-R.exe CMD INSTALL dist/sqlmlutils_0.7.1.zip
+R.exe CMD INSTALL dist/sqlmlutils_0.7.2.zip
 ```
 OR
 To build a new package file and install, run
@@ -19,7 +19,7 @@ To build a new package file and install, run
 ### Linux
 ```
 R.exe -e "install.packages('RODBCext', repos='https://mran.microsoft.com/snapshot/2019-02-01/')"
-R.exe CMD INSTALL dist/sqlmlutils_0.7.1.tar.gz
+R.exe CMD INSTALL dist/sqlmlutils_0.7.2.tar.gz
 ```
 
 # Getting started

R/buildandinstall.cmd

@@ -2,7 +2,5 @@ pushd .
 cd ..
 R -e "install.packages('RODBCext', repos='https://mran.microsoft.com/snapshot/2019-02-01/')"
 R CMD INSTALL --build R
-R CMD INSTALL --build R sqlmlutils.tar.gz
 mv sqlmlutils_*.zip R/dist
-mv sqlmlutils_*.tar.gz R/dist
 popd

R/man/connectionInfo.Rd

@@ -4,8 +4,13 @@
 \alias{connectionInfo}
 \title{Execute a function in SQL}
 \usage{
-connectionInfo(driver = "SQL Server", server = "localhost",
-  database = "master", uid = NULL, pwd = NULL)
+connectionInfo(
+  driver = "SQL Server",
+  server = "localhost",
+  database = "master",
+  uid = NULL,
+  pwd = NULL
+)
 }
 \arguments{
 \item{driver}{The driver to use for the connection - defaults to SQL Server}

R/man/createSprocFromFunction.Rd

@@ -5,11 +5,23 @@
 \alias{createSprocFromScript}
 \title{Create a Stored Procedure}
 \usage{
-createSprocFromFunction(connectionString, name, func, inputParams = NULL,
-  outputParams = NULL, getScript = FALSE)
+createSprocFromFunction(
+  connectionString,
+  name,
+  func,
+  inputParams = NULL,
+  outputParams = NULL,
+  getScript = FALSE
+)
 
-createSprocFromScript(connectionString, name, script, inputParams = NULL,
-  outputParams = NULL, getScript = FALSE)
+createSprocFromScript(
+  connectionString,
+  name,
+  script,
+  inputParams = NULL,
+  outputParams = NULL,
+  getScript = FALSE
+)
 }
 \arguments{
 \item{connectionString}{character string. The connectionString to the database}

R/man/executeFunctionInSQL.Rd

@@ -4,8 +4,13 @@
 \alias{executeFunctionInSQL}
 \title{Execute a function in SQL}
 \usage{
-executeFunctionInSQL(connectionString, func, ..., inputDataQuery = "",
-  getScript = FALSE)
+executeFunctionInSQL(
+  connectionString,
+  func,
+  ...,
+  inputDataQuery = "",
+  getScript = FALSE
+)
 }
 \arguments{
 \item{connectionString}{character string. The connectionString to the database}

R/man/executeScriptInSQL.Rd

@@ -4,8 +4,12 @@
 \alias{executeScriptInSQL}
 \title{Execute a script in SQL}
 \usage{
-executeScriptInSQL(connectionString, script, inputDataQuery = "",
-  getScript = FALSE)
+executeScriptInSQL(
+  connectionString,
+  script,
+  inputDataQuery = "",
+  getScript = FALSE
+)
 }
 \arguments{
 \item{connectionString}{character string. The connectionString to the database}

R/man/sql_install.packages.Rd

@@ -4,9 +4,16 @@
 \alias{sql_install.packages}
 \title{sql_install.packages}
 \usage{
-sql_install.packages(connectionString, pkgs, skipMissing = FALSE, repos,
-  verbose = getOption("verbose"), scope = "private", owner = "",
-  scriptFile = NULL)
+sql_install.packages(
+  connectionString,
+  pkgs,
+  skipMissing = FALSE,
+  repos,
+  verbose = getOption("verbose"),
+  scope = "private",
+  owner = "",
+  scriptFile = NULL
+)
 }
 \arguments{
 \item{connectionString}{ODBC connection string to Microsoft SQL Server database.}

R/man/sql_installed.packages.Rd

@@ -4,9 +4,16 @@
 \alias{sql_installed.packages}
 \title{sql_installed.packages}
 \usage{
-sql_installed.packages(connectionString, priority = NULL,
-  noCache = FALSE, fields = "Package", subarch = NULL,
-  scope = "private", owner = "", scriptFile = NULL)
+sql_installed.packages(
+  connectionString,
+  priority = NULL,
+  noCache = FALSE,
+  fields = "Package",
+  subarch = NULL,
+  scope = "private",
+  owner = "",
+  scriptFile = NULL
+)
 }
 \arguments{
 \item{connectionString}{ODBC connection string to Microsoft SQL Server database.}

R/man/sql_remove.packages.Rd

@@ -4,9 +4,16 @@
 \alias{sql_remove.packages}
 \title{sql_remove.packages}
 \usage{
-sql_remove.packages(connectionString, pkgs, dependencies = TRUE,
-  checkReferences = TRUE, verbose = getOption("verbose"),
-  scope = "private", owner = "", scriptFile = NULL)
+sql_remove.packages(
+  connectionString,
+  pkgs,
+  dependencies = TRUE,
+  checkReferences = TRUE,
+  verbose = getOption("verbose"),
+  scope = "private",
+  owner = "",
+  scriptFile = NULL
+)
 }
 \arguments{
 \item{connectionString}{ODBC connection string to SQL Server database.}

README.md

@@ -29,7 +29,7 @@ Windows:
 From command prompt, run 
 ```
 R.exe -e "install.packages('RODBCext', repos='https://mran.microsoft.com/snapshot/2019-02-01/')"
-R.exe CMD INSTALL dist/sqlmlutils_0.7.1.zip
+R.exe CMD INSTALL dist/sqlmlutils_0.7.2.zip
 ```
 OR
 To build a new package file and install, run
@@ -40,7 +40,7 @@ To build a new package file and install, run
 Linux
 ```
 R.exe -e "install.packages('RODBCext', repos='https://mran.microsoft.com/snapshot/2019-02-01/')"
-R.exe CMD INSTALL dist/sqlmlutils_0.7.1.tar.gz
+R.exe CMD INSTALL dist/sqlmlutils_0.7.2.tar.gz
 ```
 
 # Details