MYCPP-273: Allow nuppptr initialization of Value class + disambiguate Value ctors.

Author: silvakid

devapi/tests/types-t.cc

@@ -184,6 +184,20 @@ TEST_F(Types, numeric)
     EXPECT_NO_THROW(v4 = val);
     EXPECT_TRUE(v4);
   }
+
+  {
+    Value val(nullptr);
+
+    EXPECT_TRUE(val.isNull());
+
+    val = mysqlx::nullvalue;
+
+    EXPECT_TRUE(val.isNull());
+
+    val = 0;
+
+    EXPECT_FALSE(val.isNull());
+  }
 }
 
 
@@ -296,12 +310,52 @@ TEST_F(Types, basic)
   cout << "value: " << row[0] << endl;
   EXPECT_FALSE(row[0]);
 
+  cout << "Testing null value" << endl;
+
+  types.update().set("c0", nullvalue).set("c1", nullptr).execute();
+  res = types.select("c0","c1").execute();
+  row = res.fetchOne();
+
+  EXPECT_TRUE(row);
+  EXPECT_TRUE(row[0].isNull());
+  EXPECT_TRUE(row[1].isNull());
+
   cout << "Done!" << endl;
 }
 
 
 TEST_F(Types, integer)
 {
+  // Note: this part of the test does not require a running server
+
+  {
+    Value v1(-7);
+    EXPECT_EQ(Value::INT64, v1.getType());
+    EXPECT_EQ(-7, (int64_t)v1);
+
+    Value v2(-7L);
+    EXPECT_EQ(Value::INT64, v1.getType());
+    EXPECT_EQ(-7, (int64_t)v1);
+
+    Value v3(-7LL);
+    EXPECT_EQ(Value::INT64, v1.getType());
+    EXPECT_EQ(-7, (int64_t)v1);
+  }
+
+  {
+    Value v1(7U);
+    EXPECT_EQ(Value::UINT64, v1.getType());
+    EXPECT_EQ(7, (uint64_t)v1);
+
+    Value v2(7UL);
+    EXPECT_EQ(Value::UINT64, v1.getType());
+    EXPECT_EQ(7, (uint64_t)v1);
+
+    Value v3(7ULL);
+    EXPECT_EQ(Value::UINT64, v1.getType());
+    EXPECT_EQ(7, (uint64_t)v1);
+  }
+
   SKIP_IF_NO_XPLUGIN;
 
   cout << "Preparing test.int_types..." << endl;
@@ -729,6 +783,7 @@ TEST_F(Types, geometry)
   }
 }
 
+
 TEST_F(Types, int64_conversion)
 {
   SKIP_IF_NO_XPLUGIN;

include/devapi/document.h

@@ -272,6 +272,7 @@ class PUBLIC_API Value : public internal::Printable
   ///@{
 
   Value();  ///< Constructs Null value.
+  Value(std::nullptr_t); ///< Constructs Null value.
   Value(const string&);
   Value(string&&);
   Value(const char *str) : Value(string(str)) {}
@@ -282,9 +283,17 @@ class PUBLIC_API Value : public internal::Printable
   Value(float);
   Value(double);
   Value(bool);
+  Value(const DbDoc& doc);
+
+  /*
+    Note: These overloads are needed to disambiguate constructor
+    resolution.
+  */
+
   Value(int x) : Value((int64_t)x) {}
   Value(unsigned x) : Value((uint64_t)x) {}
-  Value(const DbDoc& doc);
+  Value(long x) : Value((int64_t)x) {}
+  Value(unsigned long x) : Value((uint64_t)x) {}
 
   Value(const std::initializer_list<Value> &list)
     : m_type(ARRAY)
@@ -449,6 +458,8 @@ class PUBLIC_API Value : public internal::Printable
   friend Access;
 };
 
+static const Value nullvalue;
+
 
 namespace internal {
 
@@ -538,6 +549,9 @@ const Value& DbDoc::operator[](const wchar_t *name) const
 inline Value::Value() : m_type(VNULL)
 {}
 
+inline Value::Value(std::nullptr_t) : m_type(VNULL)
+{}
+
 inline Value::Value(int64_t val) : m_type(INT64)
 {
   m_val._int64_v = val;
@@ -548,7 +562,6 @@ inline Value::Value(uint64_t val) : m_type(UINT64)
   m_val._uint64_v = val;
 }
 
-
 inline Value::operator int() const
 {
   int64_t val = (int64_t)*this;