Remove TSMySQL workaround.

Author: jeroen

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: RMySQL
-Version: 0.10.2
+Version: 0.10.3
 Title: Database Interface and MySQL Driver for R
 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")),
@@ -15,7 +15,7 @@ Imports:
     methods
 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).
@@ -32,6 +32,5 @@ Collate:
     'is-valid.R'
     'table.R'
     'transaction.R'
-    'zzz_compatibility.R'
 Suggests:
     testthat

NAMESPACE

@@ -30,7 +30,6 @@ export(mysqlHasDefault)
 exportClasses(MySQLConnection)
 exportClasses(MySQLDriver)
 exportClasses(MySQLResult)
-exportClasses(dbObjectId)
 exportMethods(SQLKeywords)
 exportMethods(dbApply)
 exportMethods(dbBegin)

NEWS.md

@@ -1,3 +1,11 @@
+# Version 0.10.3
+
+ *  Fix the RPostgreSQL conflict
+ 
+ *  Remove the workaround for the bug in TSMySQL
+ 
+ *  Update URL to MariaDB client in DESCRIPTION
+
 # Version 0.10.2
 
  *  Backport fixes from Rcpp branch.

R/data-type.R

@@ -1,6 +1,3 @@
-#' @include driver.R connection.R
-NULL
-
 #' Determine the SQL Data Type of an S object
 #'
 #' This method is a straight-forward implementation of the corresponding
@@ -19,7 +16,7 @@ setMethod("dbDataType", c("MySQLDriver", "ANY"), function(dbObj, obj) {
 })
 
 #' @export
-#' @rdname dbDataType-MySQLDriver-method
+#' @rdname dbDataType-MySQLDriver-ANY-method
 setMethod("dbDataType", c("MySQLConnection", "ANY"), function(dbObj, obj) {
   mysqlDataType(obj)
 })

R/zzz_compatibility.R

@@ -18,4 +18,4 @@ StripTrailingWhitespace: Yes
 BuildType: Package
 PackageUseDevtools: Yes
 PackageInstallArgs: --no-multiarch --with-keep.source
-PackageRoxygenize: rd,collate,namespace
+PackageRoxygenize: rd,namespace

RMySQL.Rproj

@@ -1,12 +1,11 @@
 % Generated by roxygen2 (4.1.0): do not edit by hand
-% Please edit documentation in R/connection.R, R/zzz_compatibility.R
+% Please edit documentation in R/connection.R
 \docType{methods}
 \name{db-meta}
 \alias{db-meta}
 \alias{dbGetException,MySQLConnection-method}
 \alias{dbGetInfo,MySQLConnection-method}
 \alias{dbListResults,MySQLConnection-method}
-\alias{dbObjectId-class}
 \alias{show,MySQLConnection-method}
 \alias{summary,MySQLConnection-method}
 \title{Database interface meta-data}

man/db-meta.Rd

@@ -1,14 +1,14 @@
 % Generated by roxygen2 (4.1.0): do not edit by hand
 % Please edit documentation in R/data-type.R
 \docType{methods}
-\name{dbDataType,MySQLDriver-method}
-\alias{dbDataType,MySQLConnection-method}
-\alias{dbDataType,MySQLDriver-method}
+\name{dbDataType,MySQLDriver,ANY-method}
+\alias{dbDataType,MySQLConnection,ANY-method}
+\alias{dbDataType,MySQLDriver,ANY-method}
 \title{Determine the SQL Data Type of an S object}
 \usage{
-\S4method{dbDataType}{MySQLDriver}(dbObj, obj)
+\S4method{dbDataType}{MySQLDriver,ANY}(dbObj, obj)
 
-\S4method{dbDataType}{MySQLConnection}(dbObj, obj)
+\S4method{dbDataType}{MySQLConnection,ANY}(dbObj, obj)
 }
 \arguments{
 \item{dbObj}{A \code{MySQLDriver} or \code{MySQLConnection}.}