Fixing issue with zeroed dates in MySQL - fixes mauricio#93

Author: mauricio

db-async-common/src/main/scala/com/github/mauricio/async/db/column/DateEncoderDecoder.scala

@@ -22,11 +22,16 @@ import com.github.mauricio.async.db.exceptions.DateEncoderNotAvailableException
 
 object DateEncoderDecoder extends ColumnEncoderDecoder {
 
+ private val ZeroedDate = "0000-00-00"
+
  private val formatter = DateTimeFormat.forPattern("yyyy-MM-dd")
 
- override def decode(value: String): LocalDate = {
- this.formatter.parseLocalDate(value)
- }
+ override def decode(value: String): LocalDate =
+ if ( ZeroedDate == value ) {
+ null
+ } else {
+ this.formatter.parseLocalDate(value)
+ }
 
  override def encode(value: Any): String = {
  value match {

db-async-common/src/main/scala/com/github/mauricio/async/db/column/LocalDateTimeEncoderDecoder.scala

@@ -21,6 +21,8 @@ import org.joda.time.LocalDateTime
 
 object LocalDateTimeEncoderDecoder extends ColumnEncoderDecoder {
 
+ private val ZeroedTimestamp = "0000-00-00 00:00:00"
+
  private val optional = new DateTimeFormatterBuilder()
  .appendPattern(".SSSSSS").toParser
 
@@ -33,5 +35,10 @@ object LocalDateTimeEncoderDecoder extends ColumnEncoderDecoder {
  format.print(value.asInstanceOf[LocalDateTime])
 
  override def decode(value: String): LocalDateTime =
- format.parseLocalDateTime(value)
+ if (ZeroedTimestamp == value) {
+ null
+ } else {
+ format.parseLocalDateTime(value)
+ }
+
 }

mysql-async/src/main/scala/com/github/mauricio/async/db/mysql/binary/decoder/DateDecoder.scala

@@ -20,5 +20,13 @@ import io.netty.buffer.ByteBuf
 import org.joda.time.LocalDate
 
 object DateDecoder extends BinaryDecoder {
- override def decode(buffer: ByteBuf): LocalDate = TimestampDecoder.decode(buffer).toLocalDate
+ override def decode(buffer: ByteBuf): LocalDate = {
+ val result = TimestampDecoder.decode(buffer)
+
+ if ( result != null ) {
+ result.toLocalDate
+ } else {
+ null
+ }
+ }
 }

mysql-async/src/main/scala/com/github/mauricio/async/db/mysql/binary/decoder/TimestampDecoder.scala

@@ -24,9 +24,7 @@ object TimestampDecoder extends BinaryDecoder {
  val size = buffer.readUnsignedByte()
 
  size match {
- case 0 => LocalDateTime.now()
- .withDate(0, 0, 0)
- .withTime(0, 0, 0, 0)
+ case 0 => null
  case 4 => new LocalDateTime()
  .withDate(buffer.readUnsignedShort(), buffer.readUnsignedByte(), buffer.readUnsignedByte())
  .withTime(0, 0, 0, 0)

mysql-async/src/test/resources/logback.xml

@@ -13,7 +13,7 @@
  </encoder>
  </appender>
 
- <root level="TRACE">
+ <root level="INFO">
  <appender-ref ref="STDOUT"/>
  <appender-ref ref="FILE"/>
  </root>

mysql-async/src/test/scala/com/github/mauricio/async/db/mysql/QuerySpec.scala

@@ -181,6 +181,7 @@ class QuerySpec extends Specification with ConnectionHelper {
  matcher(executeQuery(connection, select))
  ideasMatcher(executeQuery(connection, selectIdeas))
 
+ success("completed")
  }
 
  }

mysql-async/src/test/scala/com/github/mauricio/async/db/mysql/TransactionSpec.scala

@@ -1,7 +1,6 @@
 package com.github.mauricio.async.db.mysql
 
 import org.specs2.mutable.Specification
-import com.github.mauricio.async.db.util.ExecutorServiceUtils._
 import com.github.mauricio.async.db.util.FutureUtils.awaitFuture
 import com.github.mauricio.async.db.mysql.exceptions.MySQLException
 import com.github.mauricio.async.db.Connection
@@ -48,7 +47,7 @@ class TransactionSpec extends Specification with ConnectionHelper {
 
  try {
  awaitFuture(future)
- ko("Should not have arrived here")
+ failure("should not have arrived here")
  } catch {
  case e : MySQLException => {
 
@@ -58,7 +57,7 @@ class TransactionSpec extends Specification with ConnectionHelper {
  val result = executePreparedStatement(connection, this.select).rows.get
  result.size === 1
  result(0)("name") === "Maurício Aragão"
- ok("success")
+ success("correct result")
  }
  }
  }
@@ -83,14 +82,14 @@ class TransactionSpec extends Specification with ConnectionHelper {
 
  try {
  awaitFuture(future)
- ko("this should not be reached")
+ failure("this should not be reached")
  } catch {
  case e : MySQLException => {
 
  pool.availables must have size(0)
  pool.availables must not contain(connection.asInstanceOf[MySQLConnection])
 
- ok("success")
+ success("success")
  }
  }
 

mysql-async/src/test/scala/com/github/mauricio/async/db/mysql/ZeroDatesSpec.scala

@@ -0,0 +1,58 @@
+package com.github.mauricio.async.db.mysql
+
+import org.specs2.mutable.Specification
+import scala.concurrent.duration.Duration
+import com.github.mauricio.async.db.RowData
+
+class ZeroDatesSpec extends Specification with ConnectionHelper {
+
+ val createStatement =
+ """CREATE TEMPORARY TABLE dates (
+ |`name` varchar (255) NOT NULL,
+ |`timestamp_column` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+ |`date_column` date NOT NULL DEFAULT '0000-00-00',
+ |`datetime_column` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+ |`time_column` time NOT NULL DEFAULT '00:00:00',
+ |`year_column` year NOT NULL DEFAULT '0000'
+ |)
+ |ENGINE=MyISAM DEFAULT CHARSET=utf8;""".stripMargin
+
+ val insertStatement = "INSERT INTO dates (name) values ('Joe')"
+ val selectStatement = "SELECT * FROM dates"
+
+ def matchValues( result : RowData ) = {
+ result("name") === "Joe"
+ result("timestamp_column") must beNull
+ result("datetime_column") must beNull
+ result("date_column") must beNull
+ result("year_column") === 0
+ result("time_column") === Duration.Zero
+ }
+
+ "client" should {
+
+ "correctly parse the MySQL zeroed dates as NULL values in text protocol" in {
+
+ withConnection {
+ connection =>
+ executeQuery(connection, createStatement)
+ executeQuery(connection, insertStatement)
+
+ matchValues(executeQuery(connection, selectStatement).rows.get(0))
+ }
+ }
+
+ "correctly parse the MySQL zeroed dates as NULL values in binary protocol" in {
+
+ withConnection {
+ connection =>
+ executeQuery(connection, createStatement)
+ executeQuery(connection, insertStatement)
+
+ matchValues(executePreparedStatement(connection, selectStatement).rows.get(0))
+ }
+ }
+
+ }
+
+}

postgresql-async/src/test/scala/com/github/mauricio/async/db/postgresql/PreparedStatementSpec.scala

@@ -116,7 +116,7 @@ class PreparedStatementSpec extends Specification with DatabaseTestHelper {
  executeDdl(handler, this.messagesCreate)
  executeDdl(handler, create)
 
- 1.until(4).map {
+ foreach(1.until(4)) {
  x =>
  executePreparedStatement(handler, this.messagesInsert, Array(message, moment))
  executePreparedStatement(handler, insert, Array(otherMoment, otherMessage))
@@ -132,7 +132,6 @@ class PreparedStatementSpec extends Specification with DatabaseTestHelper {
  otherResult.columnNames must contain(allOf("id", "other_moment", "other_content")).inOrder
  otherResult(x - 1)("other_moment") === otherMoment
  otherResult(x - 1)("other_content") === otherMessage
-
  }
 
  }

postgresql-async/src/test/scala/com/github/mauricio/async/db/postgresql/TimeAndDateSpec.scala

@@ -128,7 +128,7 @@ class TimeAndDateSpec extends Specification with DatabaseTestHelper {
 
  "support timestamp with timezone and microseconds" in {
 
- 1.until(6).inclusive.map {
+ foreach(1.until(6)) {
  index =>
  withHandler {
  handler =>
@@ -156,8 +156,6 @@ class TimeAndDateSpec extends Specification with DatabaseTestHelper {
  dateTime.getMillis must be_>=(915779106000L)
  dateTime.getMillis must be_<(915779107000L)
  }
-
-
  }
  }