Add support for temporal types (#21)

Author: jbajic

.github/workflows/ci.yml

@@ -5,29 +5,31 @@ on: [push]
 jobs:
   build_and_test_ubuntu:
     strategy:
-     matrix:
+      matrix:
         platform: [ubuntu-20.04]
+        mg_version:
+          - 2.0.0
     runs-on: ${{ matrix.platform }}
     steps:
-    - name: Install dependencies (Ubuntu 20.04)
-      if: matrix.platform == 'ubuntu-20.04'
-      run: |
-        sudo apt install -y git cmake make gcc g++ libssl-dev # mgconsole deps
-        sudo apt install -y libpython3.8 python3-pip # memgraph deps
-        mkdir ~/memgraph
-        curl -L https://memgraph.com/download/memgraph/v1.4.0/ubuntu-20.04/memgraph_1.4.0-community-1_amd64.deb > ~/memgraph/memgraph_1.4.0-community-1_amd64.deb
-        sudo systemctl mask memgraph
-        sudo dpkg -i ~/memgraph/memgraph_1.4.0-community-1_amd64.deb
-    
-    - uses: actions/checkout@v1
-    - name: Install and test mgconsole
-      run: |
-        mkdir build
-        cd build
-        cmake ..
-        make
-        sudo make install
-        ctest
+      - name: Install dependencies (Ubuntu 20.04)
+        if: matrix.platform == 'ubuntu-20.04'
+        run: |
+          sudo apt install -y git cmake make gcc g++ libssl-dev # mgconsole deps
+          sudo apt install -y libpython3.8 python3-pip # memgraph deps
+          mkdir ~/memgraph
+          curl -L https://download.memgraph.com/memgraph/v${{ matrix.mg_version }}/ubuntu-20.04/memgraph_${{ matrix.mg_version }}-1_amd64.deb > ~/memgraph/memgraph_${{ matrix.mg_version }}-1_amd64.deb
+          sudo systemctl mask memgraph
+          sudo dpkg -i ~/memgraph/memgraph_${{ matrix.mg_version }}-1_amd64.deb
+
+      - uses: actions/checkout@v1
+      - name: Install and test mgconsole
+        run: |
+          mkdir build
+          cd build
+          cmake ..
+          make
+          sudo make install
+          ctest
 
   build_windows:
     runs-on: windows-latest
@@ -68,6 +70,10 @@ jobs:
         uses: actions/checkout@v2
       # NOTE: CI can't execute end2end tests because there is no way to run
       #       Memgraph on CI MacOS machines.
+      - name: Install openssl
+        run: |
+          brew update
+          brew install openssl
       - name: Build mgconsole
         run: |
           mkdir build
@@ -79,4 +85,3 @@ jobs:
         with:
           name: "mgconsole MacOS build"
           path: build/src/mgconsole
-

CMakeLists.txt

@@ -1,5 +1,5 @@
 # mgconsole - console client for Memgraph database
-# Copyright (C) 2016-2020 Memgraph Ltd. [https://memgraph.com]
+# Copyright (C) 2016-2021 Memgraph Ltd. [https://memgraph.com]
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

src/CMakeLists.txt

@@ -84,7 +84,7 @@ add_dependencies(${GFLAGS_LIBRARY} gflags-proj)
 ExternalProject_Add(mgclient-proj
         PREFIX            mgclient
         GIT_REPOSITORY    https://github.com/memgraph/mgclient.git
-        GIT_TAG           v1.2.1
+        GIT_TAG           v1.3.0
         CMAKE_ARGS        "-DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>"
                           "-DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}"
                           ${MACOSX_OPENSSL_ROOTDIR_FLAG}

src/main.cpp

@@ -1,5 +1,5 @@
 // mgconsole - console client for Memgraph database
-// Copyright (C) 2016-2020 Memgraph Ltd. [https://memgraph.com]
+// Copyright (C) 2016-2021 Memgraph Ltd. [https://memgraph.com]
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -37,9 +37,9 @@
 #include <mgclient.h>
 #include <replxx.h>
 
-#include "version.hpp"
-#include "utils/utils.hpp"
 #include "utils/constants.hpp"
+#include "utils/utils.hpp"
+#include "version.hpp"
 
 using namespace std::string_literals;
 
@@ -95,10 +95,12 @@ int main(int argc, char **argv) {
 
   gflags::ParseCommandLineFlags(&argc, &argv, true);
 
-  format::CsvOptions csv_opts{FLAGS_csv_delimiter, FLAGS_csv_escapechar, FLAGS_csv_doublequote};
+  format::CsvOptions csv_opts{FLAGS_csv_delimiter, FLAGS_csv_escapechar,
+                              FLAGS_csv_doublequote};
   format::OutputOptions output_opts{FLAGS_output_format, FLAGS_fit_to_screen};
 
-  if (output_opts.output_format == constants::kCsvFormat && !csv_opts.ValidateDoubleQuote()) {
+  if (output_opts.output_format == constants::kCsvFormat &&
+      !csv_opts.ValidateDoubleQuote()) {
     console::EchoFailure(
         "Unsupported combination of 'csv-doublequote' and 'csv-escapechar'\n"
         "flags",
@@ -131,16 +133,16 @@ int main(int argc, char **argv) {
       password = *password_optional;
     } else {
       console::EchoFailure("Password not submitted",
-                  "Requested password for username " + FLAGS_username);
+                           "Requested password for username " + FLAGS_username);
       cleanup_resources();
       return 1;
     }
     console::SetStdinEcho(true);
   }
 
   fs::path history_dir = FLAGS_history;
-  if (FLAGS_history ==
-      (constants::kDefaultHistoryBaseDir + "/" + constants::kDefaultHistoryMemgraphDir)) {
+  if (FLAGS_history == (constants::kDefaultHistoryBaseDir + "/" +
+                        constants::kDefaultHistoryMemgraphDir)) {
     // Fetch home dir for user.
     history_dir =
         utils::GetUserHomeDir() / constants::kDefaultHistoryMemgraphDir;
@@ -230,8 +232,9 @@ int main(int argc, char **argv) {
   mg_memory::MgSessionParamsPtr params =
       mg_memory::MakeCustomUnique<mg_session_params>(mg_session_params_make());
   if (!params) {
-    console::EchoFailure("Connection failure",
-                "out of memory, failed to allocate `mg_session_params` struct");
+    console::EchoFailure(
+        "Connection failure",
+        "out of memory, failed to allocate `mg_session_params` struct");
   }
   mg_session_params_set_host(params.get(), FLAGS_host.c_str());
   mg_session_params_set_port(params.get(), FLAGS_port);
@@ -243,21 +246,23 @@ int main(int argc, char **argv) {
   mg_session_params_set_sslmode(
       params.get(), FLAGS_use_ssl ? MG_SSLMODE_REQUIRE : MG_SSLMODE_DISABLE);
 
-  mg_memory::MgSessionPtr session = mg_memory::MakeCustomUnique<mg_session>(nullptr);
+  mg_memory::MgSessionPtr session =
+      mg_memory::MakeCustomUnique<mg_session>(nullptr);
   {
     mg_session *session_tmp;
     int status = mg_connect(params.get(), &session_tmp);
     session = mg_memory::MakeCustomUnique<mg_session>(session_tmp);
     if (status != 0) {
-      console::EchoFailure("Connection failure", mg_session_error(session.get()));
+      console::EchoFailure("Connection failure",
+                           mg_session_error(session.get()));
       cleanup_resources();
       return 1;
     }
   }
 
   console::EchoInfo("mgconsole "s + gflags::VersionString());
   console::EchoInfo("Connected to 'memgraph://" + FLAGS_host + ":" +
-           std::to_string(FLAGS_port) + "'");
+                    std::to_string(FLAGS_port) + "'");
   console::EchoInfo("Type :help for shell usage");
   console::EchoInfo("Quit the shell by typing Ctrl-D(eof) or :quit");
   int num_retries = 3;
@@ -267,10 +272,12 @@ int main(int argc, char **argv) {
       console::EchoInfo("Bye");
       break;
     }
-    if (query->empty()) continue;
+    if (query->empty())
+      continue;
     try {
       auto ret = query::ExecuteQuery(session.get(), *query);
-      if (ret.records.size() > 0) Output(ret.header, ret.records, output_opts, csv_opts);
+      if (ret.records.size() > 0)
+        Output(ret.header, ret.records, output_opts, csv_opts);
       if (console::is_a_tty(STDIN_FILENO)) {
         std::string summary;
         if (ret.records.size() == 0) {
@@ -307,7 +314,8 @@ int main(int argc, char **argv) {
         int status = mg_connect(params.get(), &session_tmp);
         session = mg_memory::MakeCustomUnique<mg_session>(session_tmp);
         if (status != 0) {
-          console::EchoFailure("Connection failure", mg_session_error(session.get()));
+          console::EchoFailure("Connection failure",
+                               mg_session_error(session.get()));
           session.reset(nullptr);
         } else {
           is_connected = true;
@@ -318,11 +326,11 @@ int main(int argc, char **argv) {
       if (is_connected) {
         num_retries = 3;
         console::EchoInfo("Connected to 'memgraph://" + FLAGS_host + ":" +
-                 std::to_string(FLAGS_port) + "'");
+                          std::to_string(FLAGS_port) + "'");
       } else {
-        console::EchoFailure("Couldn't connect to", "'memgraph://" + FLAGS_host + ":" +
-                                               std::to_string(FLAGS_port) +
-                                               "'");
+        console::EchoFailure("Couldn't connect to",
+                             "'memgraph://" + FLAGS_host + ":" +
+                                 std::to_string(FLAGS_port) + "'");
         cleanup_resources();
         return 1;
       }