Merge pull request #3 from KWB-R/dev

Release v0.4.0

.Rbuildignore

@@ -8,4 +8,5 @@
 _pkgdown.yaml
 LICENSE\.md$
 .gitlab-ci.yml
-README\.Rmd$
+^index\.md$
+^\.travis\.yml$

.travis.yml

@@ -1,10 +1,31 @@
+##############################################################################
+### Autogenerated with R package kwb.pkgbuild v0.1.1
+### (installed from 'Github (kwb-r/kwb.pkgbuild@0ac3694)' source code on 2019-09-06)
+### by calling the function kwb.pkgbuild::use_travis()
+### (file created at: 2019-09-06 15:48:52)
+##############################################################################
+
+
 language: r
-r:
-  - oldrel 
-  - release
 sudo: required
+cache: packages
 r_packages:
-  - devtools
-  - covr
-after_success:
-  - Rscript -e 'covr::codecov()'
+- remotes
+- covr
+matrix:
+  include:
+  - r: devel
+  - r: release
+    after_success:
+    - Rscript -e 'covr::codecov()'
+    before_deploy:
+    - Rscript -e 'remotes::install_cran("pkgdown")'
+    deploy:
+      provider: script
+      script: Rscript -e 'pkgdown::deploy_site_github(verbose = TRUE)'
+      skip_cleanup: 'true'
+      on:
+        branch: 
+        - master
+        - dev
+  - r: oldrel

DESCRIPTION

@@ -1,16 +1,18 @@
 Package: kwb.db
-Version: 0.3.0.9000
+Version: 0.4.0
 Title: Functions supporting data base access
-Description: This package contains some useful functions, especially for simplifying data transfer
-           between MS Access databases and R. With the functions of this package it is not needed
-           any more to open and close a database connection explicitely; this is done 'behind the
-           scenes' in the functions. Instead of a database connection the path to the database file
-           needs to be passed to the functions as an argument. The main functions are hsGetTable
-           and hsPutTable which transfer data from an MS Access database to a data frame in R and
-           save data from a data frame in R into a table in an MS Access database, respectively.
-           Take care when getting time series data from an MS Access database, see therefore
-           hsMdbTimeSeries. Use hsTables to get a list of tables that are available in a database
-           and hsFields to get a list of table fields that are contained in a database table.
+Description: This package contains some useful functions, especially for 
+    simplifying data transfer between MS Access databases and R. With the 
+    functions of this package it is not needed any more to open and close a 
+    database connection explicitely; this is done 'behind the scenes' in the 
+    functions. Instead of a database connection the path to the database file
+    needs to be passed to the functions as an argument. The main functions are 
+    hsGetTable and hsPutTable which transfer data from an MS Access database to 
+    a data frame in R and save data from a data frame in R into a table in an MS 
+    Access database, respectively. Take care when getting time series data from 
+    an MS Access database, see therefore hsMdbTimeSeries. Use hsTables to get a 
+    list of tables that are available in a database and hsFields to get a list 
+    of table fields that are contained in a database table.
 Authors@R: 
     c(person(given = "Hauke",
              family = "Sonnenberg",
@@ -24,15 +26,19 @@ Authors@R:
              comment = "0000-0003-0647-7726"),
       person(given = "Kompetenzzentrum Wasser Berlin gGmbH",
              role = "cph"))
-Imports: kwb.utils, RODBC
+Imports:
+    kwb.datetime (>= 0.4.0),
+    kwb.utils (>= 0.4.4),
+    odbc32 (>= 0.2.7),
+    RODBC (>= 1.3.16)
 Suggests: 
-    kwb.datetime,
-    testthat
+    testthat (>= 2.2.1)
 Remotes: 
    github::kwb-r/kwb.datetime,
-   github::kwb-r/kwb.utils
+   github::kwb-r/kwb.utils,
+   github::vh-d/odbc32
 Encoding: UTF-8
 License: MIT + file LICENSE
-RoxygenNote: 6.1.0
+RoxygenNote: 6.1.1
 URL: https://github.com/KWB-R/kwb.db
 BugReports: https://github.com/KWB-R/kwb.db/issues

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2014-2018 Kompetenzzentrum Wasser Berlin gGmbH (KWB)
+Copyright (c) 2014-2019 Kompetenzzentrum Wasser Berlin gGmbH (KWB)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE.md

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright (c) 2014-2018 Kompetenzzentrum Wasser Berlin gGmbH (KWB)
+Copyright (c) 2014-2019 Kompetenzzentrum Wasser Berlin gGmbH (KWB)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

NAMESPACE

@@ -1,26 +1,20 @@
-export(connectionStringAccess)
+# Originally generated by roxygen2 but then modified so that the functions
+# odbcConnect...() are only imported on a Windows machine (see below)
+
 export(createRDatabaseInterface)
 export(currentDb)
 export(dataFrameToSqlTuples)
-export(dumpDatabase)
 export(getCurrentSqlDialect)
-export(getDatabaseSchema)
-export(getFilteredRecords)
-export(getSqlDialect)
-export(getTypeIdentifier)
+export(getNamedExcelRanges)
 export(hsClearTable)
-export(hsCloseDb)
 export(hsCloseMdb)
 export(hsDropTable)
-export(hsDumpMdb)
 export(hsFields)
 export(hsGetTable)
 export(hsGetTimeSeries)
-export(hsJetDate)
 export(hsLookupOrAddRecord)
 export(hsMdbTimeSeries)
 export(hsOpenDb)
-export(hsOpenMdb)
 export(hsPutTable)
 export(hsSetForeignKey)
 export(hsSetPrimaryKey)
@@ -31,25 +25,16 @@ export(hsSqlExTimeGroup)
 export(hsSqlExTsFields)
 export(hsSqlQuery)
 export(hsTables)
-export(hsTsField)
-export(isExcel2007File)
 export(isExcelFile)
 export(isMySQL)
+export(keyValueToSql)
 export(keyValuesToSql)
 export(keyValuesToSqlAssignment)
 export(keyValuesToSqlAssignment2)
-export(keyValuesToSqlFilter)
 export(listValuesToSql)
 export(lookupRecord)
-export(openAdequateConnectionOrStop)
-export(printDatabaseSchema)
-export(rcode_DatabaseInterface)
-export(readSqlCommandsFromFile)
 export(renamesToFieldList)
 export(renamesToQueries)
-export(runSqlCommandsFromFile)
-export(safeTableName)
-export(selectFromDb)
 export(selectFromTable)
 export(setCurrentDb)
 export(setCurrentSqlDialect)
@@ -58,11 +43,40 @@ export(sqlForInsertDataFrame)
 export(sqlForInsertFromSelect)
 export(sqlForInsertIgnoreInMsAccess)
 export(sqlForSelect)
-export(sqlForSelectByKey)
-export(sqlForUpdate)
 export(sqlFullLeftJoin)
 export(sqlJoinExpression)
-export(sqlLeftJoin)
-export(sqlLeftJoinBody)
 export(sqlLeftJoinExpression)
 export(xmdb)
+importFrom(RODBC,odbcConnect)
+
+if(tools:::.OStype() == "windows") {
+  importFrom(RODBC,odbcConnectAccess)
+  importFrom(RODBC,odbcConnectAccess2007)
+  importFrom(RODBC,odbcConnectExcel)
+  importFrom(RODBC,odbcConnectExcel2007)
+}
+
+importFrom(RODBC,odbcDataSources)
+importFrom(RODBC,sqlColumns)
+importFrom(RODBC,sqlDrop)
+importFrom(RODBC,sqlSave)
+importFrom(RODBC,sqlTables)
+importFrom(kwb.datetime,hsToPosix)
+importFrom(kwb.utils,catAndRun)
+importFrom(kwb.utils,catIf)
+importFrom(kwb.utils,commaCollapsed)
+importFrom(kwb.utils,createDirectory)
+importFrom(kwb.utils,defaultIfNULL)
+importFrom(kwb.utils,hsQuoteChr)
+importFrom(kwb.utils,hsSafeName)
+importFrom(kwb.utils,hsTrim)
+importFrom(kwb.utils,inRange)
+importFrom(kwb.utils,isNullOrEmpty)
+importFrom(kwb.utils,printIf)
+importFrom(kwb.utils,safePath)
+importFrom(kwb.utils,warningDeprecated)
+importFrom(kwb.utils,windowsPath)
+importFrom(stats,setNames)
+importFrom(utils,head)
+importFrom(utils,str)
+importFrom(utils,write.table)

NEWS

@@ -1,7 +1,21 @@
-Changes in kwb.db 0.1.1
-=========================
-* xmdb now points to example database in this package not in kwb.base
-
-Changes in kwb.db 0.1.0
-=========================
-* package created with functions that were originally in kwb.base
+Changes in kwb.db 0.4.0 (2019-11-03)
+====================================
+* Use the package odbc32 by Vaclav Hausenblas in order to use Window's 32 bit
+  ODBC driver from within a 64 bit R session.
+* Decrease the number of exported functions. 
+  TODO: Check if some functions need to be exported again as they may be used
+  in some scripts that were/are used at KWB.
+
+2019-06-07
+* give a warning when using deprecated functions hsOpenMdb(), hsCloseMdb()
+
+2019-06-06
+* support 64 Bit in odbcConnectionAccess()
+
+Changes in kwb.db 0.1.1
+=======================
+* xmdb now points to example database in this package not in kwb.base
+
+Changes in kwb.db 0.1.0
+=======================
+* package created with functions that were originally in kwb.base