add type into the field description

Author: siscia

redisql_lib/src/redis.rs

@@ -713,28 +713,38 @@ pub fn stream_query_result_array(
         let mut xadd = rm::XADDCommand::new(&context, stream_name);
         for (j, entity) in row.iter().enumerate() {
             match entity {
-                sql::Entity::Null
-                | sql::Entity::OK {}
-                | sql::Entity::DONE { .. } => {
+                sql::Entity::OK {} | sql::Entity::DONE { .. } => {
                     // do nothing
                 }
+                sql::Entity::Null => {
+                    xadd.add_element(
+                        &format!("null:{}", &columns_names[j]),
+                        "(null)",
+                    );
+                }
                 sql::Entity::Integer { int } => {
                     xadd.add_element(
-                        &columns_names[j],
+                        &format!("int:{}", &columns_names[j]),
                         &int.to_string(),
                     );
                 }
                 sql::Entity::Float { float } => {
                     xadd.add_element(
-                        &columns_names[j],
+                        &format!("real:{}", &columns_names[j]),
                         &float.to_string(),
                     );
                 }
                 sql::Entity::Text { text } => {
-                    xadd.add_element(&columns_names[j], text);
+                    xadd.add_element(
+                        &format!("text:{}", &columns_names[j]),
+                        text,
+                    );
                 }
                 sql::Entity::Blob { blob } => {
-                    xadd.add_element(&columns_names[j], blob);
+                    xadd.add_element(
+                        &format!("blob:{}", &columns_names[j]),
+                        blob,
+                    );
                 }
             }
         }

test/correctness/test.py

@@ -657,7 +657,7 @@ def test_stream_query(self):
             self.assertEquals(len(result), total_len)
 
             for i, row in enumerate(result):
-                self.assertEquals(row[1], ['a', str(i), 'b', "bar", 'c', str(i+1)])
+                self.assertEquals(row[1], ['int:a', str(i), 'text:b', "bar", 'int:c', str(i+1)])
 
     def test_stream_query_statement(self):
         with DB(self, "B"):
@@ -681,7 +681,7 @@ def test_stream_query_statement(self):
             self.assertEquals(len(result), total_len)
 
             for i, row in enumerate(result):
-                self.assertEquals(row[1], ['a', str(i), 'b', "bar", 'c', str(i-1)])
+                self.assertEquals(row[1], ['int:a', str(i), 'text:b', "bar", 'int:c', str(i-1)])
 
 class TestStreamsSynchronous(TestRediSQLWithExec):
     def test_stream_query(self):
@@ -702,7 +702,7 @@ def test_stream_query(self):
             self.assertEquals(len(result), total_len)
 
             for i, row in enumerate(result):
-                self.assertEquals(row[1], ['a', str(i), 'b', "bar", 'c', str(i+1)])
+                self.assertEquals(row[1], ['int:a', str(i), 'text:b', "bar", 'int:c', str(i+1)])
 
     def test_stream_query_statement(self):
         with DB(self, "B"):
@@ -726,7 +726,7 @@ def test_stream_query_statement(self):
             self.assertEquals(len(result), total_len)
 
             for i, row in enumerate(result):
-                self.assertEquals(row[1], ['a', str(i), 'b', "bar", 'c', str(i-1)])
+                self.assertEquals(row[1], ['int:a', str(i), 'text:b', "bar", 'int:c', str(i-1)])
 
 
 if __name__ == '__main__':