From 30e02de6f318e87f704a4e32e9101060fd2853be Mon Sep 17 00:00:00 2001
From: rbygrave <robin.bygrave@gmail.com>
Date: Tue, 3 Feb 2015 00:57:58 +1300
Subject: [PATCH] Fix for #236 - OptimisticLockException when saving a model
 the second time with joda DateTime and mysql 5.6

---
 .../java/com/avaje/ebean/config/dbplatform/MySqlPlatform.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/avaje/ebean/config/dbplatform/MySqlPlatform.java b/src/main/java/com/avaje/ebean/config/dbplatform/MySqlPlatform.java
index ae9a633b1..dc0c1e6b6 100644
--- a/src/main/java/com/avaje/ebean/config/dbplatform/MySqlPlatform.java
+++ b/src/main/java/com/avaje/ebean/config/dbplatform/MySqlPlatform.java
@@ -37,7 +37,7 @@ public class MySqlPlatform extends DatabasePlatform {
 
     dbTypeMap.put(Types.BIT, new DbType("tinyint(1) default 0"));
     dbTypeMap.put(Types.BOOLEAN, new DbType("tinyint(1) default 0"));
-    dbTypeMap.put(Types.TIMESTAMP, new DbType("datetime"));
+    dbTypeMap.put(Types.TIMESTAMP, new DbType("datetime(6)"));
     dbTypeMap.put(Types.CLOB, new MySqlClob());
     dbTypeMap.put(Types.BLOB, new MySqlBlob());
     dbTypeMap.put(Types.BINARY, new DbType("binary", 255));