bugfix #250 #248

flike · Sep 12, 2016 · 3c4a1db · 3c4a1db
1 parent baf3d01
commit 3c4a1db
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/core/hack/version.go b/core/hack/version.go
@@ -1,6 +1,6 @@
 package hack
 
 const (
-	Version = "2016-09-04 09:40:08 +0800 @9669ac0"
-	Compile = "2016-09-09 20:48:47 +0800 by go version go1.7.1 darwin/amd64"
+	Version = "2016-09-12 09:56:29 +0800 @e78adff"
+	Compile = "2016-09-12 10:14:16 +0800 by go version go1.6.2 linux/amd64"
 )
diff --git a/mysql/resultset.go b/mysql/resultset.go
@@ -65,10 +65,9 @@ func (p RowData) ParseText(f []*Field) ([]interface{}, error) {
 			case MYSQL_TYPE_FLOAT, MYSQL_TYPE_DOUBLE, MYSQL_TYPE_NEWDECIMAL:
 				data[i], err = strconv.ParseFloat(string(v), 64)
 			case MYSQL_TYPE_VARCHAR, MYSQL_TYPE_VAR_STRING,
-				MYSQL_TYPE_STRING, MYSQL_TYPE_DATETIME, MYSQL_TYPE_DATE, MYSQL_TYPE_TIME:
+				MYSQL_TYPE_STRING, MYSQL_TYPE_DATETIME,
+				MYSQL_TYPE_DATE, MYSQL_TYPE_TIME, MYSQL_TYPE_TIMESTAMP:
 				data[i] = string(v)
-			case MYSQL_TYPE_TIMESTAMP:
-				data[i], err = strconv.ParseInt(string(v), 10, 64)
 			default:
 				data[i] = v
 			}