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

microsoft · Jun 15, 2020 · 50e09d9 · 50e09d9
1 parent 57c0009
commit 50e09d9
Show file tree

Hide file tree

Showing 16 changed files with 74 additions and 29 deletions.
diff --git a/R/DESCRIPTION b/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
diff --git a/R/R/sqlPackage.R b/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))

diff --git a/R/README.md b/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

diff --git a/R/buildandinstall.cmd b/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
diff --git a/R/dist/sqlmlutils_0.7.1.tar.gz b/R/dist/sqlmlutils_0.7.1.tar.gz
diff --git a/R/dist/sqlmlutils_0.7.1.zip b/R/dist/sqlmlutils_0.7.1.zip
diff --git a/R/dist/sqlmlutils_0.7.2.tar.gz b/R/dist/sqlmlutils_0.7.2.tar.gz
diff --git a/R/dist/sqlmlutils_0.7.2.zip b/R/dist/sqlmlutils_0.7.2.zip
diff --git a/R/man/connectionInfo.Rd b/R/man/connectionInfo.Rd
diff --git a/R/man/createSprocFromFunction.Rd b/R/man/createSprocFromFunction.Rd
diff --git a/R/man/executeFunctionInSQL.Rd b/R/man/executeFunctionInSQL.Rd
diff --git a/R/man/executeScriptInSQL.Rd b/R/man/executeScriptInSQL.Rd
diff --git a/R/man/sql_install.packages.Rd b/R/man/sql_install.packages.Rd
diff --git a/R/man/sql_installed.packages.Rd b/R/man/sql_installed.packages.Rd
diff --git a/R/man/sql_remove.packages.Rd b/R/man/sql_remove.packages.Rd
diff --git a/README.md b/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