BUG30950184: Fix error when using the fractional part in DATETIME

In the X DevAPI implementation, an error is raised when using the
fractional part in DATETIME types.

This patch fixes this issue by taking in account the fractional part
when detecting DATETIME types and adds tests for regression.

Author: nmariz

lib/mysqlx/result.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -488,10 +488,10 @@ def _map_datetime(self):
         """Map datetime."""
         if self._length == 10:
             self._col_type = ColumnType.DATE
-        elif self._length == 19:
-            self._col_type = ColumnType.DATETIME
         elif self._flags & DatetimeColumnFlags.TIMESTAMP > 0:
             self._col_type = ColumnType.TIMESTAMP
+        elif self._length >= 19:
+            self._col_type = ColumnType.DATETIME
         else:
             raise ValueError("Datetime mapping scenario unhandled")
 

tests/test_mysqlx_crud.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2016, 2020, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -2662,19 +2662,23 @@ def test_column_metadata(self):
 
         self.session.sql(
             "CREATE TABLE {0}(age INT, name VARCHAR(50), pic VARBINARY(100), "
-            "config JSON, created DATE, active BIT)"
-            "".format(table_name)).execute()
+            "config JSON, created DATE, updated DATETIME(6), ts TIMESTAMP(2), "
+            "active BIT)".format(table_name)).execute()
         self.session.sql(
-            "INSERT INTO {0} VALUES (21, 'Fred', NULL, NULL, '2008-07-26', 0)"
+            "INSERT INTO {0} VALUES (21, 'Fred', NULL, NULL, '2008-07-26', "
+            "'2019-01-19 03:14:07.999999', '2020-01-01 10:10:10+05:30', 0)"
             "".format(table_name)).execute()
         self.session.sql(
-            "INSERT INTO {0} VALUES (28, 'Barney', NULL, NULL, '2012-03-12'"
-            ", 0)".format(table_name)).execute()
+            "INSERT INTO {0} VALUES (28, 'Barney', NULL, NULL, '2012-03-12', "
+            "'2019-01-19 03:14:07.999999', '2020-01-01 10:10:10+05:30', 0)"
+            "".format(table_name)).execute()
         self.session.sql(
-            "INSERT INTO {0} VALUES (42, 'Wilma', NULL, NULL, '1975-11-11', 1)"
+            "INSERT INTO {0} VALUES (42, 'Wilma', NULL, NULL, '1975-11-11', "
+            "'2019-01-19 03:14:07.999999', '2020-01-01 10:10:10+05:30', 1)"
             "".format(table_name)).execute()
         self.session.sql(
-            "INSERT INTO {0} VALUES (67, 'Betty', NULL, NULL, '2015-06-21', 0)"
+            "INSERT INTO {0} VALUES (67, 'Betty', NULL, NULL, '2015-06-21', "
+            "'2019-01-19 03:14:07.999999', '2020-01-01 10:10:10+05:30', 0)"
             "".format(table_name)).execute()
 
         table = self.schema.get_table("test")
@@ -2705,7 +2709,22 @@ def test_column_metadata(self):
         self.assertEqual("test", col.get_table_name())
         self.assertEqual(mysqlx.ColumnType.JSON, col.get_type())
 
+        col = result.columns[4]
+        self.assertEqual("created", col.get_column_name())
+        self.assertEqual("test", col.get_table_name())
+        self.assertEqual(mysqlx.ColumnType.DATE, col.get_type())
+
         col = result.columns[5]
+        self.assertEqual("updated", col.get_column_name())
+        self.assertEqual("test", col.get_table_name())
+        self.assertEqual(mysqlx.ColumnType.DATETIME, col.get_type())
+
+        col = result.columns[6]
+        self.assertEqual("ts", col.get_column_name())
+        self.assertEqual("test", col.get_table_name())
+        self.assertEqual(mysqlx.ColumnType.TIMESTAMP, col.get_type())
+
+        col = result.columns[7]
         self.assertEqual("active", col.get_column_name())
         self.assertEqual("test", col.get_table_name())
         self.assertEqual(mysqlx.ColumnType.BIT, col.get_type())