Merge pull request #6 from YaroShkvorets/yaro/add_timestamp

Add `Timestamp` type

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [Unreleased]
+
+Added `Timestamp` type.
+
 ## [1.3.2]
 
 Added `ToValue` implementation for for `Vec<Vec<u8>>` which used to create Graph Node schema object of the form `[Bytes]`.

proto/sf/substreams/sink/entity/v1/entity.proto

@@ -32,8 +32,9 @@ message Value {
     string string = 4;
     string bytes = 5;
     bool bool = 6;
+    int64 timestamp = 7;
 
-    //reserved 7 to 9;  // For future types
+    //reserved 8 to 9;  // For future types
 
     Array array = 10;
   }

substreams-entity-change/src/pb/sf.substreams.sink.entity.v1.rs

@@ -63,7 +63,7 @@ pub mod entity_change {
 #[allow(clippy::derive_partial_eq_without_eq)]
 #[derive(Clone, PartialEq, ::prost::Message)]
 pub struct Value {
-    #[prost(oneof="value::Typed", tags="1, 2, 3, 4, 5, 6, 10")]
+    #[prost(oneof="value::Typed", tags="1, 2, 3, 4, 5, 6, 7, 10")]
     pub typed: ::core::option::Option<value::Typed>,
 }
 /// Nested message and enum types in `Value`.
@@ -83,7 +83,9 @@ pub mod value {
         Bytes(::prost::alloc::string::String),
         #[prost(bool, tag="6")]
         Bool(bool),
-        // reserved 7 to 9;  // For future types
+        #[prost(int64, tag="7")]
+        Timestamp(i64),
+        // reserved 8 to 9;  // For future types
 
         #[prost(message, tag="10")]
         Array(super::Array),

substreams-entity-change/src/tables.rs

@@ -406,7 +406,9 @@ impl ToValue for Vec<BigDecimal> {
 impl ToValue for &::prost_types::Timestamp {
     fn to_value(self) -> Value {
         Value {
-            typed: Some(Typed::String(self.to_string())),
+            typed: Some(Typed::Timestamp(
+                self.seconds * 1_000_000 + self.nanos as i64 / 1000,
+            )),
         }
     }
 }
@@ -471,6 +473,37 @@ mod test {
 
     use super::Tables;
 
+    #[test]
+    fn test_timestamp() {
+        let mut tables = Tables::new();
+        tables.create_row("table", "1").set(
+            "field",
+            &::prost_types::Timestamp {
+                seconds: 123,
+                nanos: 456789000,
+            },
+        );
+
+        let changes = tables.to_entity_changes();
+        assert_eq!(changes.entity_changes.len(), 1);
+        assert_eq!(
+            changes.entity_changes[0],
+            EntityChange {
+                entity: "table".to_string(),
+                id: "1".to_string(),
+                operation: Operation::Create as i32,
+                fields: vec![Field {
+                    name: "field".to_string(),
+                    new_value: Some(Value {
+                        typed: Some(Typed::Timestamp(123456789)),
+                    }),
+                    ..Default::default()
+                }],
+                ..Default::default()
+            }
+        );
+    }
+
     #[test]
     fn test_vec_vec_u8() {
         let mut tables = Tables::new();