Added type enum col to torii indexer

dojoengine · Oct 3, 2023 · b8bc50a · b8bc50a
1 parent cb79f2b
commit b8bc50a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/crates/dojo-types/src/schema.rs b/crates/dojo-types/src/schema.rs
@@ -1,6 +1,7 @@
 use itertools::Itertools;
 use serde::{Deserialize, Serialize};
 use starknet::core::types::FieldElement;
+use strum_macros::AsRefStr;
 
 use crate::primitive::{Primitive, PrimitiveError};
 
@@ -33,7 +34,7 @@ pub struct ModelMetadata {
 }
 
 /// Represents all possible types in Cairo
-#[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
+#[derive(AsRefStr, Clone, Debug, Serialize, Deserialize, PartialEq)]
 pub enum Ty {
     Primitive(Primitive),
     Struct(Struct),

diff --git a/crates/torii/core/src/sql.rs b/crates/torii/core/src/sql.rs
@@ -335,10 +335,11 @@ impl Sql {
 
                 self.query_queue.push(format!(
                     "INSERT OR IGNORE INTO model_members (id, model_id, model_idx, member_idx, \
-                     name, type, key) VALUES ('{table_id}', '{}', '{model_idx}', '{member_idx}', \
-                     '{name}', '{}', {})",
+                     name, type, type_enum, key) VALUES ('{table_id}', '{}', '{model_idx}', \
+                     '{member_idx}', '{name}', '{}', '{}', {})",
                     path[0],
                     member.ty.name(),
+                    member.ty.as_ref(),
                     member.key,
                 ));
             }

diff --git a/crates/torii/migrations/20230316154230_setup.sql b/crates/torii/migrations/20230316154230_setup.sql
@@ -31,6 +31,7 @@ CREATE TABLE model_members(
     model_id TEXT NOT NULL,
     name TEXT NOT NULL,
     type TEXT NOT NULL,
+    type_enum TEXT DEFAULT 'Primitive' CHECK(type_enum IN ('Primitive', 'Struct', 'Enum', 'Tuple')) NOT NULL,
     key BOOLEAN NOT NULL,
     created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP,
     PRIMARY KEY (id, member_idx) FOREIGN KEY (model_id) REFERENCES models(id)