test: query builder views over tables with nested data types

Author: joshua-spacetime

smoketests/tests/views.py

@@ -154,14 +154,6 @@ class SqlViews(Smoketest):
 }
 """
 
-    def assertSql(self, sql, expected):
-        self.maxDiff = None
-        sql_out = self.spacetime("sql", self.database_identity, sql)
-        sql_out = "\n".join([line.rstrip() for line in sql_out.splitlines()])
-        expected = "\n".join([line.rstrip() for line in expected.splitlines()])
-        
-        self.assertMultiLineEqual(sql_out, expected)
-
     def insert_initial_data(self):
         self.spacetime(
             "sql",
@@ -389,13 +381,6 @@ class AutoMigrateViews(Smoketest):
 }
 """
 
-    def assertSql(self, sql, expected):
-        self.maxDiff = None
-        sql_out = self.spacetime("sql", self.database_identity, sql)
-        sql_out = "\n".join([line.rstrip() for line in sql_out.splitlines()])
-        expected = "\n".join([line.rstrip() for line in expected.splitlines()])
-        self.assertMultiLineEqual(sql_out, expected)
-
     def test_views_auto_migration(self):
         """Assert that views are auto-migrated correctly"""
 
@@ -551,13 +536,6 @@ class AutoMigrateViewsTrapped(Smoketest):
 }
 """
 
-    def assertSql(self, sql, expected):
-        self.maxDiff = None
-        sql_out = self.spacetime("sql", self.database_identity, sql)
-        sql_out = "\n".join([line.rstrip() for line in sql_out.splitlines()])
-        expected = "\n".join([line.rstrip() for line in expected.splitlines()])
-        self.assertMultiLineEqual(sql_out, expected)
-
     def test_recovery_from_trapped_views_auto_migration(self):
         """Assert that view auto-migration recovers correctly after trapped migration"""
 
@@ -686,6 +664,13 @@ class QueryView(Smoketest):
     age: u8,
 }
 
+#[spacetimedb::table(name = nested_internal)]
+pub struct Nested {
+    #[primary_key]
+    id: u8,
+    person: Person,
+}
+
 #[spacetimedb::reducer(init)]
 fn init(ctx: &ReducerContext) {
     ctx.db.user().insert(User {
@@ -723,6 +708,11 @@ class QueryView(Smoketest):
 
 }
 
+#[view(name = nested, public)]
+pub fn nested(ctx:&ViewContext)-> Query<Nested>{
+    ctx.from.nested_internal().r#where(|r| r.id.eq(0)).build()
+}
+
 #[spacetimedb::view(name = online_users, public)]
 fn online_users(ctx: &ViewContext) -> Query<User> {
     ctx.from.user().r#where(|c| c.online.eq(true)).build()
@@ -773,6 +763,14 @@ class QueryView(Smoketest):
 """
 
 
+    def test_query_view_nested_types(self):
+        """Tests that Query views can return nested data types"""
+
+        self.assertSql("SELECT * FROM nested", """\
+ id | person
+----+--------
+""")
+
     def test_query_view(self):
         """Tests that views returning Query types work as expected"""