From 925017300b1e6637a40e7dd3678214c145c9f760 Mon Sep 17 00:00:00 2001 From: Tomasz Sowa Date: Fri, 20 Apr 2018 09:41:41 +0000 Subject: [PATCH] PT::Date is serializing in the form YYYY-MM-DDTHH:MM:SSZ (eg: 1990-02-12T13:05:39Z) to JSON git-svn-id: svn://ttmath.org/publicrep/morm/trunk@1090 e52654a7-88a9-db11-a3e9-0013d4bc506e --- src/baseexpression.cpp | 6 +----- src/flatexpression.cpp | 5 +++++ src/flatexpression.h | 2 ++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/baseexpression.cpp b/src/baseexpression.cpp index 1d67c42..0c6ea5e 100644 --- a/src/baseexpression.cpp +++ b/src/baseexpression.cpp @@ -329,11 +329,7 @@ void BaseExpression::esc(void* val, PT::TextStream & stream) void BaseExpression::esc(const PT::Date & date, PT::TextStream & stream) { - //stream << date; - - // temporarily - // we need to send a form which is acceptable by Gson - date.SerializeYearMonthDay(stream); + stream << date; } diff --git a/src/flatexpression.cpp b/src/flatexpression.cpp index 8785c04..4252d47 100644 --- a/src/flatexpression.cpp +++ b/src/flatexpression.cpp @@ -39,6 +39,11 @@ namespace morm { +void FlatExpression::esc(const PT::Date & date, PT::TextStream & stream) +{ + date.SerializeISO(stream); +} + } diff --git a/src/flatexpression.h b/src/flatexpression.h index 5374f6f..b928607 100644 --- a/src/flatexpression.h +++ b/src/flatexpression.h @@ -43,7 +43,9 @@ namespace morm class FlatExpression : public BaseExpression { +public: + void esc(const PT::Date & date, PT::TextStream & stream);