Adding timeout configuration for read and write queries

.Rbuildignore

@@ -24,3 +24,4 @@ src\/RCS
 ^a\.out\.dSYM$
 ^NEWS\.md$
 ^revdep$
+^appveyor\.yml$

.gitattributes

@@ -0,0 +1 @@
+*.bin binary

.gitignore

@@ -9,3 +9,4 @@ src/Makevars
 config.status
 a.out.dSYM
 homebrew
+TAGS

.travis.yml

@@ -1,48 +1,61 @@
-# Sample .travis.yml for R projects.
-#
-# See README.md for instructions, or for more configuration options,
-# see the wiki:
-#   https://github.com/craigcitro/r-travis/wiki
+language: r
+cache: packages
 
-language: c
-services: MySQL
-
-env:
-  - BOOTSTRAP_LATEX="1"
-  - BOOTSTRAP_LATEX="1" R_CHECK_REVDEP="1" # checks reverse depends
-
-# Create a build matrix that will test a regular check
-# and also check the reverse dependencies
 matrix:
-  # http://docs.travis-ci.com/user/build-configuration/#Fast-finishing
-  # allows the build to "pass" when the non-failure-able builds are done
-  fast_finish: true
-
-  # http://docs.travis-ci.com/user/build-configuration/#Rows-That-are-Allowed-To-Fail
-  allow_failures:
-    # allows the revdep build to fail and still "pass" within travis
-    - env: BOOTSTRAP_LATEX="1" R_CHECK_REVDEP="1"
-
-
-before_install:
-  - sudo apt-get install libmysqlclient-dev
-  - curl -OL http://raw.github.com/craigcitro/r-travis/master/scripts/travis-tool.sh
-  - sudo apt-get install r-bioc-biobase r-cran-rjava
-  - chmod 755 ./travis-tool.sh
-  - ./travis-tool.sh bootstrap
-install:
-  - ./travis-tool.sh install_deps
-
-before_script:
-  - mysql -e "CREATE USER 'billy'@'localhost' IDENTIFIED BY 'supersecret';"
-  - printf "[rs-dbi]\nusername=billy\npassword=supersecret\n" > ~/.my.cnf
-
-script: ./travis-tool.sh run_tests
-
-after_failure:
-  - ./travis-tool.sh dump_logs
+  include:
+    - os: linux
+      dist: precise
+      sudo: false
+      service: mysql
+    - os: linux
+      dist: trusty
+      sudo: required
+      env: R_CODECOV=true
+      service: mysql
+      addons:
+        apt:
+          packages:
+            - libmysqlclient-dev
+    - os: osx
+      osx_image: xcode8.1
+      before_install:
+        - brew install mariadb
+        - mysql.server start
+      latex: false
+    - os: osx
+      osx_image: xcode8.1
+      before_install:
+        - brew install mysql
+        - mysql.server start
+      latex: false
+    - os: osx
+      osx_image: xcode8.1
+      disable_homebrew: true
+      r_check_args: '--no-tests'
+      before_script: 'echo no sql server, only testing build'
+    - os: osx
+      osx_image: beta-xcode6.4
+      disable_homebrew: true
+      r_check_args: '--no-tests'
+      before_script: 'echo no sql server, only testing build'
+
+r_github_packages:
+  - rstats-db/DBI
+  - jimhester/covr
+  - rstats-db/DBItest@production
+
+warnings_are_errors: true
+#r_check_revdep: true
 
 notifications:
   email:
     on_success: change
     on_failure: change
+
+before_script:
+  - mysql -e "create database IF NOT EXISTS test;" -uroot
+  - mysql -e "CREATE USER 'billy'@'localhost' IDENTIFIED BY 'supersecret';" -uroot
+  - printf "[rs-dbi]\nusername=billy\npassword=supersecret\n" > ~/.my.cnf
+
+after_success:
+  - if [[ "${R_CODECOV}" ]]; then R -e 'covr::codecov()'; fi

DESCRIPTION

@@ -1,37 +1,44 @@
 Package: RMySQL
-Version: 0.10.1
+Version: 0.11-5
 Title: Database Interface and MySQL Driver for R
+Encoding: UTF-8
 Description: Implements DBI-compliant Interface to MySQL and MariaDB Databases.
-Authors@R: c(person("Jeroen", "Ooms", email = "jeroen.ooms@stat.ucla.edu", role = c("aut", "cre")),
+Authors@R: c(person("Jeroen", "Ooms", email = "jeroen@berkeley.edu", role = c("aut", "cre")),
     person("David", "James", role = "aut"),
     person("Saikat", "DebRoy", role = "aut"),
     person("Hadley", "Wickham", email = "hadley@rstudio.com", role = "aut"),
     person("Jeffrey", "Horner", role = "aut"),
-    person("RStudio", role = "cph"))
+    person("RStudio", role = "cph"),
+    person("Kungliga Tekniska Högskolan", role = "ctb", comment = "Source code for timegm"))
 Depends:
-    R (>= 2.8.0),
-    DBI (>= 0.3.1)
+    R (>= 2.8.0)
 Imports:
-    methods
+    methods,
+    DBI (>= 0.3.1.9007),
+    Rcpp (>= 0.12.4)
+Suggests:
+    testthat,
+    DBItest
+LinkingTo: Rcpp, BH
 License: GPL-2
 URL: https://github.com/rstats-db/rmysql,
-    https://downloads.mariadb.org/client-native/
+    https://downloads.mariadb.org/connector-c/
 BugReports: https://github.com/rstats-db/rmysql/issues
-SystemRequirements: MySQL/MariaDB client headers and libraries, except on
-    Windows. E.g. libmysqlclient-dev (Debian/Ubuntu), mariadb-devel (Fedora).
+SystemRequirements: libmariadb-client-lgpl-dev or libmysqlclient-dev (deb),
+    mariadb-connector-c-devel or mariadb-devel (rpm),
+    mariadb-connector-c or mysql-connector-c (brew)
 NeedsCompilation: yes
 Collate:
-    'mysql.R'
-    'driver.R'
-    'connection.R'
-    'data-type.R'
+    'MySQLConnection.R'
+    'MySQLDriver.R'
+    'MySQLResult.R'
+    'RMySQL.R'
+    'RcppExports.R'
+    'connect.R'
     'default.R'
-    'escaping.R'
-    'result.R'
-    'extension.R'
-    'is-valid.R'
+    'deprecated.R'
+    'query.R'
+    'quote.R'
     'table.R'
     'transaction.R'
-    'zzz_compatibility.R'
-Suggests:
-    testthat
+RoxygenNote: 6.0.1

NAMESPACE

@@ -1,4 +1,4 @@
-# Generated by roxygen2 (4.1.0): do not edit by hand
+# Generated by roxygen2: do not edit by hand
 
 export(CLIENT_COMPRESS)
 export(CLIENT_CONNECT_WITH_DB)
@@ -19,76 +19,49 @@ export(CLIENT_SECURE_CONNECTION)
 export(CLIENT_SSL)
 export(CLIENT_TRANSACTIONS)
 export(MySQL)
-export(dbApply)
 export(dbEscapeStrings)
-export(dbMoreResults)
-export(dbNextResult)
+export(dbGetQuery)
 export(isIdCurrent)
 export(mysqlBuildTableDefinition)
 export(mysqlClientLibraryVersions)
+export(mysqlDefault)
+export(mysqlExecQuery)
 export(mysqlHasDefault)
 exportClasses(MySQLConnection)
 exportClasses(MySQLDriver)
 exportClasses(MySQLResult)
-exportClasses(dbObjectId)
 exportMethods(SQLKeywords)
-exportMethods(dbApply)
 exportMethods(dbBegin)
+exportMethods(dbBind)
 exportMethods(dbClearResult)
 exportMethods(dbColumnInfo)
 exportMethods(dbCommit)
 exportMethods(dbConnect)
 exportMethods(dbDataType)
 exportMethods(dbDisconnect)
-exportMethods(dbEscapeStrings)
 exportMethods(dbExistsTable)
 exportMethods(dbFetch)
-exportMethods(dbGetException)
 exportMethods(dbGetInfo)
 exportMethods(dbGetRowCount)
 exportMethods(dbGetRowsAffected)
 exportMethods(dbGetStatement)
 exportMethods(dbHasCompleted)
 exportMethods(dbIsValid)
-exportMethods(dbListConnections)
-exportMethods(dbListFields)
-exportMethods(dbListResults)
 exportMethods(dbListTables)
-exportMethods(dbMoreResults)
-exportMethods(dbNextResult)
 exportMethods(dbQuoteIdentifier)
+exportMethods(dbQuoteString)
 exportMethods(dbReadTable)
 exportMethods(dbRemoveTable)
 exportMethods(dbRollback)
 exportMethods(dbSendQuery)
-exportMethods(dbUnloadDriver)
 exportMethods(dbWriteTable)
 exportMethods(fetch)
 exportMethods(isSQLKeyword)
 exportMethods(make.db.names)
 exportMethods(show)
-exportMethods(summary)
 import(DBI)
 import(methods)
+importFrom(Rcpp,sourceCpp)
+importFrom(utils,read.table)
+importFrom(utils,write.table)
 useDynLib(RMySQL)
-useDynLib(RMySQL,RS_MySQL_cloneConnection)
-useDynLib(RMySQL,RS_MySQL_closeConnection)
-useDynLib(RMySQL,RS_MySQL_closeResultSet)
-useDynLib(RMySQL,RS_MySQL_connectionInfo)
-useDynLib(RMySQL,RS_MySQL_dbApply)
-useDynLib(RMySQL,RS_MySQL_exec)
-useDynLib(RMySQL,RS_MySQL_fetch)
-useDynLib(RMySQL,RS_MySQL_moreResultSets)
-useDynLib(RMySQL,RS_MySQL_newConnection)
-useDynLib(RMySQL,RS_MySQL_nextResultSet)
-useDynLib(RMySQL,RS_MySQL_resultSetInfo)
-useDynLib(RMySQL,rmysql_connection_valid)
-useDynLib(RMySQL,rmysql_driver_close)
-useDynLib(RMySQL,rmysql_driver_info)
-useDynLib(RMySQL,rmysql_driver_init)
-useDynLib(RMySQL,rmysql_driver_valid)
-useDynLib(RMySQL,rmysql_escape_strings)
-useDynLib(RMySQL,rmysql_exception_info)
-useDynLib(RMySQL,rmysql_fields_info)
-useDynLib(RMySQL,rmysql_result_valid)
-useDynLib(RMySQL,rmysql_version)

NEWS.md

@@ -1,3 +1,86 @@
+## RMySQL 0.11-5 (2016-12-29)
+
+- Add package-level documentation (#159, @Ironholds).
+- The `host` and `db` slots of the `MySQLConnection` object now contain actual host and database names, even if they were retrieved from a configuration file (#127, @peternowee).
+- Fix typos in the documentation of `dbConnect()` (#175, @mcol).
+
+
+## RMySQL 0.11-4 (2016-12-29)
+
+- Adapt to `DBItest` changes.
+- Fix compiler warnings.
+- Improve compatibility with different versions of `libmysql`.
+
+
+# RMySQL 0.11-3 (2016-06-08)
+
+- Fix failing compilation on Linux if a  function is declared elsewhere.
+- More robust check for numeric `NA` values.
+- New SSL-related arguments to `dbConnect()`: `ssl.key`, `ssl.cert`, `ssl.ca`, `ssl.capath`, `ssl.cipher` (#131, #148, @adamchainz).
+- Add `TAGS` file to .gitignore (@sambrightman, #78).
+- Can build with MariaDB libraries on Ubuntu (#145).
+- Use new `sqlRownamesToColumn()` and `sqlColumnToRownames()` (rstats-db/DBI#91).
+- Use `const&` for `Rcpp::Nullable` (@peternowee, #129).
+- Use container-based builds on Travis (#143).
+
+
+# RMySQL 0.11-2 (2016-03-29)
+
+- Use the `DBItest` package for testing (#100).
+
+
+# RMySQL 0.11-1 (2016-03-24)
+
+ *  RMySQL fully supports DATE and DATETIME columns. On output, DATE columns
+    will be converted to vectors of `Date`s and DATETIME will be converted
+    to `POSIXct`. To faciliate correct computation of time zone, RMySQL
+    always sets the session timezone to UTC.
+
+ *  RMySQL has been rewritten (essentially from scratch) in C++ with
+    Rcpp. This has considerably reduced the amount of code, and allow us to
+    take advantage of the more sophisticated memory management tools available in
+    Rcpp. This rewrite should yield some minor performance improvements, but 
+    most importantly protect against memory leaks and crashes. It also provides
+    a better base for future development.
+
+ *  Support for prepared queries: create prepared query with `dbSendQuery()` 
+    and bind values with `dbBind()`. `dbSendQuery()` and `dbGetQuery()` also 
+    support inline parameterised queries, like 
+    `dbGetQuery(mysqlDefault(), "SELECT * FROM mtcars WHERE cyl = :cyl", 
+    params = list(cyl = 4))`. This has no performance benefits but protects you 
+    from SQL injection attacks.
+
+ * `dbListFields()` has been removed. Please use `dbColumnInfo()` instead.
+
+ * `dbGetInfo()` has been removed. Please use the individual metadata 
+    functions.
+
+ *  Information formerly contain in `summary()` methods has now been integrated
+    into `show()` methods.
+
+ *  `make.db.names()` has been deprecated. Use `dbQuoteIdentifier()` instead.
+
+ *  `isIdCurrent()` has been deprecated. Use `dbIsValid()` instead.
+
+ *  `dbApply()`, `dbMoreResults()` and `dbNextResults()` have been removed.
+    These were always flagged as experimental, and now the experiment is over.
+
+ *  `dbEscapeStrings()` has been deprecated. Please use `dbQuoteStrings()`
+    instead.
+
+ *  dbObjectId compatibility shim removed
+
+ *  Add SSL support on Windows.
+
+ *  Fix repetition of strings in subsequent rows (@peternowee, #125).
+
+ *  Always set connection character set to utf-8
+
+ *  Backport build system improvements from stable branch
+
+ *  Reenable Travis-CI, switch to R Travis, collect coverage
+
+
 # Version 0.10.1
 
  *  Fix configure script for OSX 10.6 Snow Leopard