Tweaks

Author: jeroen

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: RMySQL
 Version: 0.10.3.9000
-Title: Database Interface and MySQL Driver for R
-Description: Implements DBI-compliant Interface to MySQL and MariaDB Databases.
+Title: Database Interface and 'MySQL' Driver for R
+Description: Implements 'DBI' Interface to 'MySQL' and 'MariaDB' Databases.
 Authors@R: c(person("Jeroen", "Ooms", email = "jeroen.ooms@stat.ucla.edu", role = c("aut", "cre")),
     person("David", "James", role = "aut"),
     person("Saikat", "DebRoy", role = "aut"),

NAMESPACE

@@ -69,6 +69,9 @@ exportMethods(show)
 exportMethods(summary)
 import(DBI)
 import(methods)
+importFrom(utils,packageVersion)
+importFrom(utils,read.table)
+importFrom(utils,write.table)
 useDynLib(RMySQL)
 useDynLib(RMySQL,RS_MySQL_cloneConnection)
 useDynLib(RMySQL,RS_MySQL_closeConnection)

NEWS.md

@@ -1,4 +1,10 @@
+# Version 0.10.4
+
  *  Fix dbWriteTable bug with MySQL-based Infobright database
+ 
+ *  Use mariadb_config if available
+ 
+ *  Properly import used utils functions
 
 # Version 0.10.3
 

R/driver.R

@@ -25,6 +25,7 @@ setClass("MySQLDriver",
 #'   default.)
 #' @export
 #' @import methods DBI
+#' @importFrom utils packageVersion read.table write.table
 #' @useDynLib RMySQL
 #' @rdname MySQLDriver-class
 #' @examples

configure

@@ -26,6 +26,16 @@ if [ $(command -v mysql_config) ]; then
   exit 0
 fi
 
+# If the mariadb_config command is availble, use that
+if [ $(command -v mariadb_config) ]; then
+  echo "Found mariadb_config"
+  MYSQL_CFLAGS=$(mariadb_config --cflags)
+  MYSQL_LIBS=$(mariadb_config --libs)
+  echo "PKG_CPPFLAGS=$MYSQL_CFLAGS" > src/Makevars
+  echo "PKG_LIBS=$MYSQL_LIBS" >> src/Makevars
+  exit 0
+fi
+
 # Force static linking on OSX to support redistributable binary packages.
 if [ $(echo "$OSTYPE" | grep "darwin") ]; then