bug: fix year formatting in spanner::Date

google/cloud/spanner/integration_tests/CMakeLists.txt

@@ -30,6 +30,7 @@ function (spanner_client_define_integration_tests)
     set(spanner_client_integration_tests
         # cmake-format: sortable
         client_integration_test.cc
+        data_types_integration_test.cc
         database_admin_integration_test.cc
         client_stress_test.cc
         instance_admin_integration_test.cc

google/cloud/spanner/integration_tests/data_types_integration_test.cc

@@ -0,0 +1,101 @@
+// Copyright 2019 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#include "google/cloud/spanner/client.h"
+#include "google/cloud/spanner/database.h"
+#include "google/cloud/spanner/database_admin_client.h"
+#include "google/cloud/spanner/mutations.h"
+#include "google/cloud/spanner/testing/database_environment.h"
+#include "google/cloud/internal/getenv.h"
+#include "google/cloud/testing_util/assert_ok.h"
+#include "google/cloud/testing_util/init_google_mock.h"
+#include <gmock/gmock.h>
+
+namespace google {
+namespace cloud {
+namespace spanner {
+inline namespace SPANNER_CLIENT_NS {
+namespace {
+
+class DataTypeIntegrationTest : public ::testing::Test {
+ public:
+  static void SetUpTestSuite() {
+    client_ = google::cloud::internal::make_unique<Client>(
+        MakeConnection(spanner_testing::DatabaseEnvironment::GetDatabase()));
+  }
+
+  void SetUp() override {
+    auto commit_result = client_->Commit([](Transaction const&) {
+      return Mutations{
+          MakeDeleteMutation("Singers", KeySet::All()),
+          MakeDeleteMutation("DataTypes", KeySet::All()),
+      };
+    });
+    EXPECT_STATUS_OK(commit_result);
+  }
+
+  static void TearDownTestSuite() { client_ = nullptr; }
+
+ protected:
+  static std::unique_ptr<Client> client_;
+};
+
+std::unique_ptr<Client> DataTypeIntegrationTest::client_;
+
+TEST_F(DataTypeIntegrationTest, ReadWriteDate) {
+  auto& client = *client_;
+  using RowType = std::tuple<std::string, Date, std::string>;
+  RowType read_back;
+  auto commit_result = client_->Commit(
+      [&client, &read_back](Transaction const& txn) -> StatusOr<Mutations> {
+        auto result = client.ExecuteDml(
+            txn,
+            SqlStatement(
+                "INSERT INTO DataTypes (Id, DateValue, StringValue) "
+                "VALUES(@id, @date, @event)",
+                {{"id", Value("ReadWriteDate-1")},
+                 {"date", Value(Date(161, 3, 8))},
+                 {"event", Value("Marcus Aurelius ascends to the throne")}}));
+        if (!result) return std::move(result).status();
+
+        auto reader = client.ExecuteQuery(
+            txn, SqlStatement("SELECT Id, DateValue, StringValue FROM DataTypes"
+                              " WHERE Id = @id",
+                              {{"id", Value("ReadWriteDate-1")}}));
+
+        auto row = GetCurrentRow(StreamOf<RowType>(reader));
+        if (!row) return std::move(row).status();
+        read_back = *std::move(row);
+        return Mutations{};
+      });
+
+  ASSERT_TRUE(commit_result.ok());
+  EXPECT_EQ("ReadWriteDate-1", std::get<0>(read_back));
+  EXPECT_EQ(Date(161, 3, 8), std::get<1>(read_back));
+  EXPECT_EQ("Marcus Aurelius ascends to the throne", std::get<2>(read_back));
+}
+
+}  // namespace
+}  // namespace SPANNER_CLIENT_NS
+}  // namespace spanner
+}  // namespace cloud
+}  // namespace google
+
+int main(int argc, char* argv[]) {
+  ::google::cloud::testing_util::InitGoogleMock(argc, argv);
+  (void)::testing::AddGlobalTestEnvironment(
+      new google::cloud::spanner_testing::DatabaseEnvironment());
+
+  return RUN_ALL_TESTS();
+}

google/cloud/spanner/integration_tests/spanner_client_integration_tests.bzl

@@ -18,6 +18,7 @@
 
 spanner_client_integration_tests = [
     "client_integration_test.cc",
+    "data_types_integration_test.cc",
     "database_admin_integration_test.cc",
     "client_stress_test.cc",
     "instance_admin_integration_test.cc",

google/cloud/spanner/internal/date.cc

@@ -25,7 +25,7 @@ namespace internal {
 
 std::string DateToString(Date d) {
   std::array<char, sizeof "-9223372036854775808-01-01"> buf;
-  std::snprintf(buf.data(), buf.size(), "%" PRId64 "-%02d-%02d", d.year(),
+  std::snprintf(buf.data(), buf.size(), "%04" PRId64 "-%02d-%02d", d.year(),
                 d.month(), d.day());
   return std::string(buf.data());
 }

google/cloud/spanner/internal/date_test.cc

@@ -24,6 +24,9 @@ namespace {
 
 TEST(Date, DateToString) {
   EXPECT_EQ("2019-06-21", DateToString(Date(2019, 6, 21)));
+  EXPECT_EQ("1066-10-14", DateToString(Date(1066, 10, 14)));
+  EXPECT_EQ("0865-03-21", DateToString(Date(865, 3, 21)));
+  EXPECT_EQ("0014-08-19", DateToString(Date(14, 8, 19)));
 }
 
 TEST(Date, DateFromString) {

google/cloud/spanner/testing/database_environment.cc

@@ -44,11 +44,17 @@ void DatabaseEnvironment::SetUp() {
   std::cout << "Creating database and table " << std::flush;
   spanner::DatabaseAdminClient admin_client;
   auto database_future =
-      admin_client.CreateDatabase(*db_, {R"""(CREATE TABLE Singers (
+      admin_client.CreateDatabase(*db_, {R"sql(CREATE TABLE Singers (
                                 SingerId   INT64 NOT NULL,
                                 FirstName  STRING(1024),
                                 LastName   STRING(1024)
-                             ) PRIMARY KEY (SingerId))"""});
+                             ) PRIMARY KEY (SingerId))sql",
+                                         R"sql(CREATE TABLE DataTypes (
+    Id STRING(256) NOT NULL,
+    BoolValue BOOL,
+    DateValue DATE,
+    StringValue STRING(1024),
+  ) PRIMARY KEY (Id))sql"});
   int i = 0;
   int const timeout = 120;
   while (++i < timeout) {