Fix a bug in the fromDbStringLocal() method (#101)

Author: an-tao

trantor/unittests/DateUnittest.cc

@@ -23,6 +23,19 @@ TEST(Date, constructorTest)
                      .toCustomedFormattedStringLocal("%Y-%m-%d %H:%M:%S", true)
                      .c_str());
 }
+TEST(Date, DatabaseStringTest)
+{
+    auto now = trantor::Date::now();
+    EXPECT_EQ(now, trantor::Date::fromDbStringLocal(now.toDbStringLocal()));
+    std::string dbString = "2018-01-01 00:00:00.123";
+    auto dbDate = trantor::Date::fromDbStringLocal(dbString);
+    auto ms = (dbDate.microSecondsSinceEpoch() % 1000000) / 1000;
+    EXPECT_EQ(ms, 123);
+    dbString = "2018-01-01 00:00:00";
+    dbDate = trantor::Date::fromDbStringLocal(dbString);
+    ms = (dbDate.microSecondsSinceEpoch() % 1000000) / 1000;
+    EXPECT_EQ(ms, 0);
+}
 int main(int argc, char **argv)
 {
     testing::InitGoogleTest(&argc, argv);

trantor/utils/Date.cc

@@ -293,10 +293,19 @@ Date Date::fromDbStringLocal(const std::string &datetime)
             {
                 hour = std::stol(time[0]);
                 minute = std::stol(time[1]);
-                second = std::stol(time[2]);
-                if (3 < time.size())
+                auto seconds = splitString(time[2], ".");
+                second = std::stol(seconds[0]);
+                if (1 < seconds.size())
                 {
-                    microSecond = std::stol(time[3]);
+                    if (seconds[1].length() > 6)
+                    {
+                        seconds[1].resize(6);
+                    }
+                    else if (seconds[1].length() < 6)
+                    {
+                        seconds[1].append(6 - seconds[1].length(), '0');
+                    }
+                    microSecond = std::stol(seconds[1]);
                 }
             }
         }