mst-appear
diff --git a/‎Procfile
Lines changed: 1 addition & 1 deletion b/‎Procfile
Lines changed: 1 addition & 1 deletion
diff --git a/‎postgresql-async/src/main/scala/com/github/mauricio/async/db/postgresql/column/PostgreSQLTimestampEncoderDecoder.scala
Lines changed: 10 additions & 6 deletions b/‎postgresql-async/src/main/scala/com/github/mauricio/async/db/postgresql/column/PostgreSQLTimestampEncoderDecoder.scala
Lines changed: 10 additions & 6 deletions
diff --git a/‎postgresql-async/src/main/scala/com/github/mauricio/async/db/postgresql/messages/backend/PostgreSQLColumnData.scala
Lines changed: 8 additions & 8 deletions b/‎postgresql-async/src/main/scala/com/github/mauricio/async/db/postgresql/messages/backend/PostgreSQLColumnData.scala
Lines changed: 8 additions & 8 deletions
diff --git a/‎postgresql-async/src/test/scala/com/github/mauricio/async/db/postgresql/TimeAndDateSpec.scala
Lines changed: 1 addition & 13 deletions b/‎postgresql-async/src/test/scala/com/github/mauricio/async/db/postgresql/TimeAndDateSpec.scala
Lines changed: 1 addition & 13 deletions
@@ -1,2 +1,2 @@
-postgresql: /usr/local/Cellar/postgresql/9.2.4/bin/postgres -D /Users/mauricio/databases/postgresql
+postgresql: postgres -D /Users/mauricio/databases/postgresql
 mysql: mysqld --log-warnings --console
@@ -61,24 +61,28 @@ object PostgreSQLTimestampEncoderDecoder extends ColumnEncoderDecoder {
 
     val format = columnType.dataType match {
       case ColumnTypes.Timestamp | ColumnTypes.TimestampArray | ColumnTypes.TimestampWithTimezoneArray => {
-        if ( text.contains(".") ) {
-          internalFormatters(5)
-        } else {
-          internalFormatterWithoutSeconds
-        }
+        selectFormatter(text)
       }
       case ColumnTypes.TimestampWithTimezone => {
         if ( columnType.dataTypeModifier > 0 ) {
           internalFormatters(columnType.dataTypeModifier - 1)
         } else {
-          internalFormatterWithoutSeconds
+          selectFormatter(text)
         }
       }
     }
 
     format.parseDateTime(text)
   }
 
+  private def selectFormatter( text : String ) = {
+    if ( text.contains(".") ) {
+      internalFormatters(5)
+    } else {
+      internalFormatterWithoutSeconds
+    }
+  }
+
   override def decode(value : String) : Any = throw new UnsupportedOperationException("this method should not have been called")
 
   override def encode(value: Any): String = {
 
@@ -18,11 +18,11 @@ package com.github.mauricio.async.db.postgresql.messages.backend
 
 import com.github.mauricio.async.db.general.ColumnData
 
-class PostgreSQLColumnData(
-                  val name: String,
-                  val tableObjectId: Int,
-                  val columnNumber: Int,
-                  val dataType: Int,
-                  val dataTypeSize: Long,
-                  val dataTypeModifier: Int,
-                  val fieldFormat: Int) extends ColumnData
+case class PostgreSQLColumnData(
+                  name: String,
+                  tableObjectId: Int,
+                  columnNumber: Int,
+                  dataType: Int,
+                  dataTypeSize: Long,
+                  dataTypeModifier: Int,
+                  fieldFormat: Int) extends ColumnData
@@ -161,18 +161,6 @@ class TimeAndDateSpec extends Specification with DatabaseTestHelper {
       }
     }
 
-    /* TODO postgresql-async cannnot parse timestamp value which is set by current_timestamp
-
-[info] ! support current_timestamp with timezone
-[error]     IllegalArgumentException: Invalid format: "2013-10-06 22:56:21.459635+09" is malformed at ".459635+09" (DateTimeFormatter.java:871)
-[error] org.joda.time.format.DateTimeFormatter.parseDateTime(DateTimeFormatter.java:871)
-[error] com.github.mauricio.async.db.postgresql.column.PostgreSQLTimestampEncoderDecoder$.decode(PostgreSQLTimestampEncoderDecoder.scala:79)
-[error] com.github.mauricio.async.db.postgresql.column.PostgreSQLColumnDecoderRegistry.decode(PostgreSQLColumnDecoderRegistry.scala:49)
-[error] com.github.mauricio.async.db.postgresql.PostgreSQLConnection.onDataRow(PostgreSQLConnection.scala:220)
-[error] com.github.mauricio.async.db.postgresql.codec.PostgreSQLConnectionHandler.channelRead0(PostgreSQLConnectionHandler.scala:149)
-[error] io.netty.channel.SimpleChannelInboundHandler.channelRead(SimpleChannelInboundHandler.java:98)
-[error] io.netty.channel.DefaultChannelHandlerContext.invokeChannelRead(DefaultChannelHandlerContext.java:337)
-    */
     "support current_timestamp with timezone" in {
       withHandler {
         handler =>
@@ -194,7 +182,7 @@ class TimeAndDateSpec extends Specification with DatabaseTestHelper {
 
           val dateTime = rows(0)("moment").asInstanceOf[DateTime]
 
-          dateTime.getMillis must be_>=(millis)
+          dateTime.getMillis must beCloseTo(millis, 100)
       }
     }