Merge branch 'release/8.0.20'

# Conflicts:
#	packaging/CMakeLists.txt

Author: rsomla1

CMakeLists.txt

@@ -198,7 +198,7 @@ if(BUILD_STATIC)
   set_property(
     DIRECTORY .
     APPEND PROPERTY COMPILE_DEFINITIONS
-    $<$<NOT:$<CONFIG:Static>>:CONCPP_BUILD_STATIC>
+    CONCPP_BUILD_STATIC
   )
 
 else()
@@ -221,7 +221,7 @@ else()
   set_property(
     DIRECTORY .
     APPEND PROPERTY COMPILE_DEFINITIONS
-    $<$<NOT:$<CONFIG:Static>>:CONCPP_BUILD_SHARED>
+    CONCPP_BUILD_SHARED
   )
   #add_compile_options($<$<NOT:$<CONFIG:Static>>:-DCONCPP_BUILD_SHARED>)
 
@@ -231,23 +231,6 @@ else()
 
 endif()
 
-if(MAINTAINER_MODE)
-
-  list(APPEND CMAKE_CONFIGURATION_TYPES Static)
-
-  set(CMAKE_CXX_FLAGS_STATIC ${CMAKE_CXX_FLAGS_RELEASE})
-  set(CMAKE_C_FLAGS_STATIC ${CMAKE_C_FLAGS_RELEASE})
-  set(CMAKE_SHARED_LINKER_FLAGS_STATIC ${CMAKE_SHARED_LINKER_FLAGS_RELEASE})
-  set(CMAKE_EXE_LINKER_FLAGS_STATIC ${CMAKE_EXE_LINKER_FLAGS_RELEASE})
-
-  set_property(
-    DIRECTORY .
-    APPEND PROPERTY COMPILE_DEFINITIONS
-    $<$<CONFIG:Static>:CONCPP_BUILD_STATIC>
-  )
-
-endif()
-
 
 add_config_option(WITH_TESTS BOOL ADVANCED DEFAULT OFF
   "Build project's unit tests"
@@ -399,13 +382,6 @@ add_subdirectory(devapi)
 merge_libraries(connector xapi devapi)
 target_include_directories(connector PUBLIC "${PROJECT_SOURCE_DIR}/include")
 
-if(MAINTAINER_MODE)
-
-  merge_libraries(connector-static STATIC xapi devapi)
-  target_include_directories(connector-static PUBLIC "${PROJECT_SOURCE_DIR}/include")
-
-endif()
-
 
 #
 # Embed rpath information in the connector library.
@@ -493,29 +469,6 @@ if(MSVC AND NOT BUILD_STATIC)
 endif()
 
 
-if(TARGET connector-static)
-
-  set_property(TARGET connector-static PROPERTY OUTPUT_NAME ${LIB_NAME_STATIC})
-
-  set_target_properties(connector-static PROPERTIES
-    VERSION "${ABI_VERSION_MAJOR}.${CONCPP_VERSION}"
-    SOVERSION "${ABI_VERSION_MAJOR}"
-  )
-
-  install(TARGETS connector-static
-    CONFIGURATIONS Static
-    ARCHIVE DESTINATION "${INSTALL_LIB_DIR_STATIC}" COMPONENT XDevAPIDev
-    RUNTIME DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll
-    LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT XDevAPIDll
-  )
-
-  if(TARGET connector-jdbc-static)
-    add_dependencies(connector-static connector-jdbc-static)
-  endif()
-
-endif()
-
-
 #
 # Tests
 # =====

common/result.cc

@@ -155,6 +155,14 @@ convert(cdk::bytes data, Format_descr<cdk::TYPE_DOCUMENT>&)
 }
 
 
+Value
+mysqlx::impl::common::
+convert(cdk::foundation::bytes data, Format_descr<cdk::TYPE_DATETIME> &)
+{
+  return{ data.begin(), data.size()};
+}
+
+
 
 /*
   Result implementation

common/result.h

@@ -693,6 +693,7 @@ Value convert(cdk::bytes, Format_descr<cdk::TYPE_STRING>&);
 Value convert(cdk::bytes, Format_descr<cdk::TYPE_INTEGER>&);
 Value convert(cdk::bytes, Format_descr<cdk::TYPE_FLOAT>&);
 Value convert(cdk::bytes, Format_descr<cdk::TYPE_DOCUMENT>&);
+Value convert(cdk::bytes, Format_descr<cdk::TYPE_DATETIME>&);
 
 /*
   Generic template used when no type-specific specialization is defined.

devapi/tests/types-t.cc

@@ -777,7 +777,8 @@ TEST_F(Types, datetime)
     "  c0 DATE,"
     "  c1 TIME,"
     "  c2 DATETIME,"
-    "  c3 TIMESTAMP"
+    "  c3 TIMESTAMP,"
+    "  c4 DATETIME"
     ")"
     );
 
@@ -789,6 +790,7 @@ TEST_F(Types, datetime)
   data[1] = "10:40:23.456";
   data[2] = "2014-05-11 10:40";
   data[3] = "2014-05-11 11:35:00.000";
+  data[4] = Value();
 
   types.insert().values(data).execute();
 
@@ -812,6 +814,10 @@ TEST_F(Types, datetime)
   cout << "column #3 type: " << c3.getType() << endl;
   EXPECT_EQ(Type::TIMESTAMP, c3.getType());
 
+  const Column &c4 = res.getColumn(4);
+  cout << "column #4 type: " << c4.getType() << endl;
+  EXPECT_EQ(Type::DATETIME, c4.getType());
+
 
   Row row = res.fetchOne();
 
@@ -822,7 +828,25 @@ TEST_F(Types, datetime)
   for (unsigned j = 0; j < res.getColumnCount(); ++j)
   {
     cout << "- col#" << j << ": " << row[j] << endl;
+    if(j==4)
+    {
+      EXPECT_TRUE(row[j].isNull());
+      break;
+    }
     EXPECT_EQ(Value::RAW, row[j].getType());
+    switch(res.getColumn(j).getType())
+    {
+    case Type::DATE:
+    case Type::TIME:
+      EXPECT_EQ(4, row[j].getRawBytes().size());
+      break;
+    case Type::DATETIME:
+    case Type::TIMESTAMP:
+      EXPECT_EQ(6, row[j].getRawBytes().size());
+      break;
+    default:
+      FAIL() << "Unexpected type! Update UT";
+    }
   }
 }
 

jdbc

@@ -27,6 +27,30 @@
 # along with this program; if not, write to the Free Software Foundation, Inc.,
 # 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
+# ======================================================================
+# Install manifest
+# ======================================================================
+
+# If requested, generate install manifest file which contains information
+# about install components and files in each component. INSTALL_MANIFEST
+# should be a path to the manifest file.
+# See the install_mainfest.cmake script in this directory.
+
+if(DEFINED INSTALL_MANIFEST)
+
+add_custom_target(generate_manifest
+  ALL
+  COMMAND ${CMAKE_COMMAND}
+    -D MANIFEST_FILE=${INSTALL_MANIFEST}
+    -D BUILD_DIR=${PROJECT_BINARY_DIR}
+    -D CONFIG=$<CONFIG>
+    -P "${CMAKE_CURRENT_SOURCE_DIR}/install_manifest.cmake"
+  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
+  COMMENT "Generating install manifest"
+)
+
+endif()
+
 
 # ======================================================================
 # Licenses for binary packages