misc: Add logs if running in debug mode

api/schema.graphql

@@ -15,12 +15,15 @@ type Entity {
   """Entity description (if available)"""
   description: String
 
-  """Entity name (if available)"""
+  """Entity cover (if available)"""
   cover: String
 
-  """Entity name (if available)"""
+  """Entity blocks (if available)"""
   blocks: [Entity!]!
 
+  """Types of the entity (which are entities themselves)"""
+  types: [Entity!]!
+
   """
   The space ID of the entity (note: the same entity can exist in multiple spaces)
   """
@@ -30,14 +33,14 @@ type Entity {
   updatedAt: String!
   updatedAtBlock: String!
 
-  """Types of the entity (which are entities themselves)"""
-  types: [Entity!]!
-
   """Attributes of the entity"""
   attributes(filter: AttributeFilter): [Triple!]!
 
   """Relations outgoing from the entity"""
   relations(where: EntityRelationFilter): [Relation!]!
+
+  """Versions of the entity, ordered chronologically"""
+  versions: [EntityVersion!]!
 }
 
 """Filter the entities by attributes and their values and value types"""
@@ -75,8 +78,6 @@ input EntityFilter {
   idNotIn: [String!]
 
   """Exact match for the entity types"""
-  types: [String!]
-  typesNot: [String!]
   typesContains: [String!]
   typesNotContains: [String!]
   attributes: [EntityAttributeFilter!]
@@ -99,7 +100,13 @@ input EntityRelationFilter {
 
   """Filter the relations by the entity they point to"""
   to: EntityFilter
-  attributes: [EntityAttributeFilter!]
+}
+
+type EntityVersion {
+  id: String!
+
+  """Attributes of the entity"""
+  attributes(filter: AttributeFilter): [Triple!]!
 }
 
 type Options {
@@ -115,54 +122,38 @@ enum OrderDirection {
 
 type Query {
   """Returns a single entity identified by its ID and space ID"""
-  entity(id: String!, spaceId: String!): Entity
+  entity(id: String!, spaceId: String!, versionId: String): Entity
 
   """
   Returns multiple entities according to the provided space ID and filter
   """
   entities(spaceId: String!, orderBy: String, orderDirection: OrderDirection, where: EntityFilter): [Entity!]!
 
   """Returns a single relation identified by its ID and space ID"""
-  relation(id: String!, spaceId: String!): Relation
+  relation(id: String!, spaceId: String!, versionId: String): Relation
 
   """
   Returns multiple relations according to the provided space ID and filter
   """
   relations(spaceId: String!, orderBy: String, orderDirection: OrderDirection, where: RelationFilter): [Relation!]!
 }
 
-"""
-Relation object
-
-Note: Relations are also entities, but they have a different structure in the database.
-In other words, the Relation object is a "view" on a relation entity. All relations
-can also be queried as entities.
-"""
+"""Relation object"""
 type Relation {
   """Relation ID"""
   id: String!
 
-  """Relation name (if available)"""
-  name: String
-  createdAt: String!
-  createdAtBlock: String!
-  updatedAt: String!
-  updatedAtBlock: String!
-
-  """Attributes of the relation"""
-  attributes: [Triple!]!
+  """Entity of the relation"""
+  entity: Entity!
 
   """Relation type of the relation"""
-  relationType: [Entity!]!
+  relationType: Entity!
 
   """Entity from which the relation originates"""
   from: Entity!
 
   """Entity to which the relation points"""
   to: Entity!
-
-  """Relations outgoing from the relation"""
-  relations(spaceId: String!, where: EntityRelationFilter): [Relation!]!
 }
 
 """Relation filter input object"""
@@ -202,6 +193,9 @@ type Triple {
   """Options of the triple (if any)"""
   options: Options!
 
+  """Space ID of the triple"""
+  spaceId: String!
+
   """Name of the attribute (if available)"""
   name: String
 }

sdk/src/mapping/entity_node.rs

@@ -3,7 +3,7 @@ use futures::stream::TryStreamExt;
 
 use serde::{Deserialize, Serialize};
 
-use crate::{error::DatabaseError, indexer_ids, models::{space, BlockMetadata}, system_ids};
+use crate::{error::DatabaseError, indexer_ids, models::BlockMetadata, system_ids};
 
 use super::{
     attributes, entity_version, query_utils::{
@@ -292,11 +292,14 @@ impl FindManyQuery {
 impl Query<Vec<EntityNode>> for FindManyQuery {
     async fn send(self) -> Result<Vec<EntityNode>, DatabaseError> {
         let neo4j = self.neo4j.clone();
-        // let query = self.into_query_part().build();
 
-        let query_part = self.into_query_part();
-        tracing::info!("eneity_node::FindManyQuery:\n{}", query_part.query());
-        let query = query_part.build();
+        let query = if cfg!(debug_assertions) {
+            let query_part = self.into_query_part();
+            tracing::info!("entity_node::FindManyQuery:\n{}", query_part.query());
+            query_part.build()
+        } else {
+            self.into_query_part().build()
+        };
 
         #[derive(Debug, Deserialize)]
         struct RowResult {

sdk/src/mapping/query_utils/query_part.rs

@@ -168,6 +168,7 @@ impl QueryPart {
                     .collect::<Vec<_>>()
                     .join(", "),
             );
+            query.push('\n');
         }
 
         if let Some((clause, other)) = &self.with_clauses {
@@ -176,6 +177,14 @@ impl QueryPart {
             query.push('\n');
         }
 
+        if let Some(limit) = self.limit {
+            query.push_str(&format!("LIMIT {}\n", limit));
+        }
+
+        if let Some(skip) = self.skip {
+            query.push_str(&format!("SKIP {}\n", skip));
+        }
+
         if !self.return_clauses.is_empty() {
             query.push_str("RETURN ");
             query.push_str(
@@ -189,14 +198,6 @@ impl QueryPart {
             query.push('\n');
         }
 
-        if let Some(limit) = self.limit {
-            query.push_str(&format!("LIMIT {}\n", limit));
-        }
-
-        if let Some(skip) = self.skip {
-            query.push_str(&format!("SKIP {}\n", skip));
-        }
-
         query
     }
 

sdk/src/mapping/triple.rs

@@ -338,7 +338,9 @@ impl Query<Option<Triple>> for FindOneQuery {
             .params("entity_id", self.entity_id)
             .params("space_id", self.space_id);
 
-        tracing::info!("triple::FindOneQuery:\n{}", query_part.query());
+        if cfg!(debug_assertions) {
+            tracing::info!("triple::FindOneQuery:\n{}", query_part.query());
+        }
         let query = query_part.build();
 
         self.neo4j
@@ -444,12 +446,14 @@ impl FindManyQuery {
 impl Query<Vec<Triple>> for FindManyQuery {
     async fn send(self) -> Result<Vec<Triple>, DatabaseError> {
         let neo4j = self.neo4j.clone();
-        // println!("FindManyQuery::send");
-        // let query = self.into_query_part().build();
 
-        let qpart = self.into_query_part();
-        tracing::info!("triple::FindManyQuery:\n{}", qpart.query());
-        let query = qpart.build();
+        let query = if cfg!(debug_assertions) {
+            let query_part = self.into_query_part();
+            tracing::info!("triple::FindManyQuery:\n{}", query_part.query());
+            query_part.build()
+        } else {
+            self.into_query_part().build()
+        };
 
         neo4j
             .execute(query)