Merge pull request #91 from mountainMath/c0.3.7

Fix warning on Solaris and Note on some other platforms

Author: mountainMath

CRAN-RELEASE

@@ -1,2 +1,2 @@
-This package was submitted to CRAN on 2021-05-07.
-Once it is accepted, delete this file and tag the release (commit fa498df).
+This package was submitted to CRAN on 2021-05-08.
+Once it is accepted, delete this file and tag the release (commit 7ff77e4).

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: cansim
 Type: Package
 Title: Accessing Statistics Canada Data Table and Vectors
-Version: 0.3.6
+Version: 0.3.7
 Authors@R: c(
     person("Jens", "von Bergmann", email = "jens@mountainmath.ca", role = c("cre")),
     person("Dmitry", "Shkolnik", email = "shkolnikd@gmail.com", role = c("aut")))
@@ -29,14 +29,14 @@ Imports: digest (>= 0.1),
     tibble,
     utils,
     DBI,
-    RSQLite,
-    dbplyr
+    RSQLite
 RoxygenNote: 7.1.1
 Suggests: knitr,
     rmarkdown,
     scales, 
     tidyr,
-    ggplot2
+    ggplot2,
+    dbplyr
 URL: https://github.com/mountainMath/cansim, https://mountainmath.github.io/cansim/, https://www.statcan.gc.ca/
 BugReports: https://github.com/mountainMath/cansim/issues
 VignetteBuilder: knitr

NEWS.md

@@ -1,3 +1,8 @@
+# cansim 0.3.7
+## Minor changes
+* Fix problem with UTF-8 encoding on solaris
+* move dbplyr dependence from Imports to Suggests
+
 # cansim 0.3.6
 ## Major changes
 * Fold part of `normalize_cansim_values` into the default table and vector output, in particular always add a scaled variable column called `val_norm` and an imputed `Date` column and covert categories to factors by default.

R/cansim_sql.R

@@ -347,12 +347,12 @@ create_index <- function(connection,table_name,field){
 #' @param append optional parameter, append to database or overwrite, defaul=`FALSE`
 #' @param col_types optional parameter for csv column types
 #' @param na na character strings
-#' @param text_encoding encoding of csv file (default UTF8)
+#' @param text_encoding encoding of csv file (default UTF-8)
 #' @param delim (Optional) csv deliminator, default is ","
 #' @keywords internal
 csv2sqlite <- function(csv_file, sqlite_file, table_name, transform=NULL,chunk_size=5000000,
                        append=FALSE,col_types=NULL,na=c(NA,"..","","...","F"),
-                       text_encoding="UTF8",delim = ",") {
+                       text_encoding="UTF-8",delim = ",") {
   # Connect to database.
   if (!append && file.exists(sqlite_file)) file.remove(sqlite_file)
   con <- DBI::dbConnect(RSQLite::SQLite(), dbname=sqlite_file)

README.md

@@ -68,7 +68,7 @@ The package also contains a convenience function that will re-scale and re-label
 
 For example, values in the `VALUE` field may be reported in "millions", so a `VALUE` of 10 means 10,000,000. By default the {cansim} package adds a `val_norm` column with scaled values, so to get the value of the `val_norm` the `VALUE` column will be converted from 10 to 10,000,000 in the example given. Similarly, percentages will be converted to rates, so instead of being 0-100 it will be normalized to 0-1 in the `val_norm` column.
 
-Prior to version 0.3.6 this was achieved by calling the `normalize_cansim_values` functions, the use of which is now redundant and is deprecated.
+Prior to version 0.3.7 this was achieved by calling the `normalize_cansim_values` functions, the use of which is now redundant and is deprecated.
 
 ### Vectors
 
@@ -173,15 +173,15 @@ If you want to get in touch, we are pretty good at responding via email or via t
 
 If you wish to cite the `cansim` package in your work:
 
-  von Bergmann, J., Dmitry Shkolnik (2021). cansim: functions and convenience tools for accessing Statistics Canada data tables. v0.3.6.
+  von Bergmann, J., Dmitry Shkolnik (2021). cansim: functions and convenience tools for accessing Statistics Canada data tables. v0.3.7.
 
 A BibTeX entry for LaTeX users is
 ```
   @Manual{,
     author = {Jens {von Bergmann} and Dmitry Shkolnik},
     title = {cansim: functions and convenience tools for accessing Statistics Canada data tables},
     year = {2021},
-    note = {R package version 0.3.6},
+    note = {R package version 0.3.7},
     url = {https://mountainmath.github.io/cansim/},
   }
 ```

cran-comments.md

@@ -1,6 +1,6 @@
 ## Test environments
-* local OS X install, R 3.6.2
-* ubuntu 14.04.5 LTS (on travis-ci), R 3.6.2
+* local OS X install, R 4.0.5
+* GitHub Action macOS-latest, windows-lastest (3.6), ubuntu-16.04 (devel, release, oldrel), ubuntu-16.04 (3.4, 3.5)
 
 ## R CMD check results
 There were no ERRORs or WARNINGs or NOTEs. 
@@ -49,3 +49,6 @@ There were no ERRORs or WARNINGs or NOTEs.
 * fix a bug that would not properly add hierarchies when category names are repeated
 * Use system unzip if `getOption("unzip")` is set to enable unzip for files larger than 4GB on unix-like systems
 
+# Changes from version 0.3.6
+* Fix problem with UTF-8 encoding on solaris
+* move dbplyr dependence from Imports to Suggests