✅ fix tests

Cargo.toml

@@ -37,6 +37,7 @@ surrealdb = { version = "1.0.0", features = ["protocol-http"] }
 assert_cmd = "2.0.11"
 assert_fs = "1.0.13"
 dir-diff = "0.3.2"
+predicates = "3.0.4"
 pretty_assertions = "1.3.0"
 serial_test = "2.0.0"
 tokio-test = "0.4.2"

embedded-files/events/publish_post.surql

@@ -1,7 +1,7 @@
 DEFINE TABLE publish_post SCHEMALESS;
 
 DEFINE FIELD post_id ON publish_post;
-DEFINE FIELD created_at ON publish_post TYPE datetime VALUE $before OR time::now();
+DEFINE FIELD created_at ON publish_post TYPE datetime DEFAULT time::now();
 
 DEFINE EVENT publish_post ON TABLE publish_post WHEN $event == "CREATE" THEN (
     UPDATE post SET status = "PUBLISHED" WHERE id = $after.post_id

embedded-files/events/unpublish_post.surql

@@ -1,7 +1,7 @@
 DEFINE TABLE unpublish_post SCHEMALESS;
 
 DEFINE FIELD post_id ON unpublish_post;
-DEFINE FIELD created_at ON unpublish_post TYPE datetime VALUE $before OR time::now();
+DEFINE FIELD created_at ON unpublish_post TYPE datetime DEFAULT time::now();
 
 DEFINE EVENT unpublish_post ON TABLE unpublish_post WHEN $event == "CREATE" THEN (
     UPDATE post SET status = "DRAFT" WHERE id = $after.post_id

embedded-files/migrations/definitions/_initial.json

@@ -1,4 +1,4 @@
 {
-  "schemas": "# in: user\n# out: post, comment\nDEFINE TABLE comment SCHEMALESS;\n\nDEFINE FIELD content ON comment TYPE string ASSERT $value != NONE;\nDEFINE FIELD created_at ON comment TYPE datetime VALUE $before OR time::now();\nDEFINE TABLE post SCHEMALESS;\n\nDEFINE FIELD title ON post TYPE string;\nDEFINE FIELD content ON post TYPE string;\nDEFINE FIELD author ON post TYPE record (user) ASSERT $value != NONE;\nDEFINE FIELD created_at ON post TYPE datetime VALUE $before OR time::now();\nDEFINE FIELD status ON post TYPE string VALUE $value OR $before OR 'DRAFT' ASSERT $value == NONE OR $value INSIDE ['DRAFT', 'PUBLISHED'];\nDEFINE TABLE script_migration SCHEMAFULL;\n\nDEFINE FIELD script_name ON script_migration TYPE string;\nDEFINE FIELD executed_at ON script_migration TYPE datetime VALUE $before OR time::now();\nDEFINE TABLE user SCHEMALESS;\n\nDEFINE FIELD username ON user TYPE string ASSERT $value != NONE;\nDEFINE FIELD email ON user TYPE string ASSERT is::email($value);\nDEFINE FIELD password ON user TYPE string ASSERT $value != NONE;\nDEFINE FIELD registered_at ON user TYPE datetime VALUE $before OR time::now();",
-  "events": "DEFINE TABLE publish_post SCHEMALESS;\n\nDEFINE FIELD post_id ON publish_post;\nDEFINE FIELD created_at ON publish_post TYPE datetime VALUE $before OR time::now();\n\nDEFINE EVENT publish_post ON TABLE publish_post WHEN $event == "CREATE" THEN (\n    UPDATE post SET status = \"PUBLISHED\" WHERE id = $after.post_id\n);\nDEFINE TABLE unpublish_post SCHEMALESS;\n\nDEFINE FIELD post_id ON unpublish_post;\nDEFINE FIELD created_at ON unpublish_post TYPE datetime VALUE $before OR time::now();\n\nDEFINE EVENT unpublish_post ON TABLE unpublish_post WHEN $event == "CREATE" THEN (\n    UPDATE post SET status = \"DRAFT\" WHERE id = $after.post_id\n);"
+  "schemas": "# in: user\n# out: post, comment\nDEFINE TABLE comment SCHEMALESS;\n\nDEFINE FIELD content ON comment TYPE string;\nDEFINE FIELD created_at ON comment TYPE datetime DEFAULT time::now();\nDEFINE TABLE post SCHEMALESS;\n\nDEFINE FIELD title ON post TYPE string;\nDEFINE FIELD content ON post TYPE string;\nDEFINE FIELD author ON post TYPE record<user>;\nDEFINE FIELD created_at ON post TYPE datetime DEFAULT time::now();\nDEFINE FIELD status ON post TYPE string DEFAULT 'DRAFT' ASSERT $value IN ['DRAFT', 'PUBLISHED'];\nDEFINE TABLE script_migration SCHEMAFULL;\n\nDEFINE FIELD script_name ON script_migration TYPE string;\nDEFINE FIELD executed_at ON script_migration TYPE datetime DEFAULT time::now();\nDEFINE TABLE user SCHEMALESS;\n\nDEFINE FIELD username ON user TYPE string;\nDEFINE FIELD email ON user TYPE string ASSERT string::is::email($value);\nDEFINE FIELD password ON user TYPE string;\nDEFINE FIELD registered_at ON user TYPE datetime DEFAULT time::now();",
+  "events": "DEFINE TABLE publish_post SCHEMALESS;\n\nDEFINE FIELD post_id ON publish_post;\nDEFINE FIELD created_at ON publish_post TYPE datetime DEFAULT time::now();\n\nDEFINE EVENT publish_post ON TABLE publish_post WHEN $event == \"CREATE\" THEN (\n    UPDATE post SET status = \"PUBLISHED\" WHERE id = $after.post_id\n);\nDEFINE TABLE unpublish_post SCHEMALESS;\n\nDEFINE FIELD post_id ON unpublish_post;\nDEFINE FIELD created_at ON unpublish_post TYPE datetime DEFAULT time::now();\n\nDEFINE EVENT unpublish_post ON TABLE unpublish_post WHEN $event == \"CREATE\" THEN (\n    UPDATE post SET status = \"DRAFT\" WHERE id = $after.post_id\n);"
 }

embedded-files/schemas/comment.surql

@@ -2,5 +2,5 @@
 # out: post, comment
 DEFINE TABLE comment SCHEMALESS;
 
-DEFINE FIELD content ON comment TYPE string ASSERT $value != NONE;
-DEFINE FIELD created_at ON comment TYPE datetime VALUE $before OR time::now();
+DEFINE FIELD content ON comment TYPE string;
+DEFINE FIELD created_at ON comment TYPE datetime DEFAULT time::now();

embedded-files/schemas/post.surql

@@ -2,6 +2,6 @@ DEFINE TABLE post SCHEMALESS;
 
 DEFINE FIELD title ON post TYPE string;
 DEFINE FIELD content ON post TYPE string;
-DEFINE FIELD author ON post TYPE record (user) ASSERT $value != NONE;
-DEFINE FIELD created_at ON post TYPE datetime VALUE $before OR time::now();
-DEFINE FIELD status ON post TYPE string VALUE $value OR $before OR 'DRAFT' ASSERT $value == NONE OR $value INSIDE ['DRAFT', 'PUBLISHED'];
+DEFINE FIELD author ON post TYPE record<user>;
+DEFINE FIELD created_at ON post TYPE datetime DEFAULT time::now();
+DEFINE FIELD status ON post TYPE string DEFAULT 'DRAFT' ASSERT $value IN ['DRAFT', 'PUBLISHED'];

embedded-files/schemas/script_migration.surql

@@ -1,4 +1,4 @@
 DEFINE TABLE script_migration SCHEMAFULL;
 
 DEFINE FIELD script_name ON script_migration TYPE string;
-DEFINE FIELD executed_at ON script_migration TYPE datetime VALUE $before OR time::now();
+DEFINE FIELD executed_at ON script_migration TYPE datetime DEFAULT time::now();

embedded-files/schemas/user.surql

@@ -1,6 +1,6 @@
 DEFINE TABLE user SCHEMALESS;
 
-DEFINE FIELD username ON user TYPE string ASSERT $value != NONE;
-DEFINE FIELD email ON user TYPE string ASSERT is::email($value);
-DEFINE FIELD password ON user TYPE string ASSERT $value != NONE;
-DEFINE FIELD registered_at ON user TYPE datetime VALUE $before OR time::now();
+DEFINE FIELD username ON user TYPE string;
+DEFINE FIELD email ON user TYPE string ASSERT string::is::email($value);
+DEFINE FIELD password ON user TYPE string;
+DEFINE FIELD registered_at ON user TYPE datetime DEFAULT time::now();

templates/blog/schemas/user.surql

@@ -30,4 +30,4 @@ DEFINE SCOPE user_scope
         SELECT *
         FROM user
         WHERE username = $username AND crypto::argon2::compare(password, $password)
-    );
+    );

tests/cli/apply/e2e.rs

@@ -85,7 +85,7 @@ async fn apply_3_consecutives_schema_and_data_changes() -> Result<()> {
     let initial_migration_definition =
         serde_json::from_str::<MigrationDefinition>(&initial_migration_definition_str)?;
 
-    ensure!(initial_migration_definition.schemas == Some(INITIAL_DEFINITION_SCHEMAS.to_string()),);
+    ensure!(initial_migration_definition.schemas == Some(INITIAL_DEFINITION_SCHEMAS.to_string()));
     ensure!(initial_migration_definition.events == Some(INITIAL_DEFINITION_EVENTS.to_string()));
 
     // Check data
@@ -567,15 +567,15 @@ DEFINE TABLE comment SCHEMALESS
         FOR create WHERE permission:create_comment IN $auth.permissions
         FOR update, delete WHERE in = $auth.id;
 
-DEFINE FIELD content ON comment TYPE string ASSERT $value != NONE;
-DEFINE FIELD created_at ON comment TYPE datetime VALUE $before OR time::now();
+DEFINE FIELD content ON comment TYPE string;
+DEFINE FIELD created_at ON comment TYPE datetime DEFAULT time::now();
 DEFINE TABLE permission SCHEMAFULL
     PERMISSIONS
         FOR select FULL
         FOR create, update, delete NONE;
 
 DEFINE FIELD name ON permission TYPE string;
-DEFINE FIELD created_at ON permission TYPE datetime VALUE $before OR time::now();
+DEFINE FIELD created_at ON permission TYPE datetime DEFAULT time::now();
 
 DEFINE INDEX unique_name ON permission COLUMNS name UNIQUE;
 DEFINE TABLE post SCHEMALESS
@@ -586,30 +586,30 @@ DEFINE TABLE post SCHEMALESS
 
 DEFINE FIELD title ON post TYPE string;
 DEFINE FIELD content ON post TYPE string;
-DEFINE FIELD author ON post TYPE record (user) ASSERT $value != NONE;
-DEFINE FIELD created_at ON post TYPE datetime VALUE $before OR time::now();
-DEFINE FIELD status ON post TYPE string VALUE $value OR $before OR 'DRAFT' ASSERT $value == NONE OR $value INSIDE ['DRAFT', 'PUBLISHED'];
+DEFINE FIELD author ON post TYPE record<user>;
+DEFINE FIELD created_at ON post TYPE datetime DEFAULT time::now();
+DEFINE FIELD status ON post TYPE string DEFAULT 'DRAFT' ASSERT $value IN ['DRAFT', 'PUBLISHED'];
 DEFINE TABLE script_migration SCHEMAFULL
     PERMISSIONS
         FOR select FULL
         FOR create, update, delete NONE;
 
 DEFINE FIELD script_name ON script_migration TYPE string;
-DEFINE FIELD executed_at ON script_migration TYPE datetime VALUE $before OR time::now();
+DEFINE FIELD executed_at ON script_migration TYPE datetime DEFAULT time::now();
 DEFINE TABLE user SCHEMAFULL
     PERMISSIONS
         FOR select FULL
         FOR update WHERE id = $auth.id
         FOR create, delete NONE;
 
-DEFINE FIELD username ON user TYPE string ASSERT $value != NONE;
-DEFINE FIELD email ON user TYPE string ASSERT is::email($value);
-DEFINE FIELD password ON user TYPE string ASSERT $value != NONE;
-DEFINE FIELD registered_at ON user TYPE datetime VALUE $before OR time::now();
-DEFINE FIELD avatar ON user TYPE string;
+DEFINE FIELD username ON user TYPE string;
+DEFINE FIELD email ON user TYPE string ASSERT string::is::email($value);
+DEFINE FIELD password ON user TYPE string;
+DEFINE FIELD registered_at ON user TYPE datetime DEFAULT time::now();
+DEFINE FIELD avatar ON user TYPE option<string>;
 
-DEFINE FIELD permissions ON user TYPE array VALUE [permission:create_post, permission:create_comment];
-DEFINE FIELD permissions.* ON user TYPE record (permission);
+DEFINE FIELD permissions ON user TYPE array<record<permission>> 
+    DEFAULT [permission:create_post, permission:create_comment];
 
 DEFINE INDEX unique_username ON user COLUMNS username UNIQUE;
 DEFINE INDEX unique_email ON user COLUMNS email UNIQUE;
@@ -635,8 +635,8 @@ const INITIAL_DEFINITION_EVENTS: &str = "DEFINE TABLE publish_post SCHEMALESS
         FOR select, create FULL
         FOR update, delete NONE;
 
-DEFINE FIELD post_id ON publish_post TYPE record(post);
-DEFINE FIELD created_at ON publish_post TYPE datetime VALUE $before OR time::now();
+DEFINE FIELD post_id ON publish_post TYPE record<post>;
+DEFINE FIELD created_at ON publish_post TYPE datetime DEFAULT time::now();
 
 DEFINE EVENT publish_post ON TABLE publish_post WHEN $event == \"CREATE\" THEN (
     UPDATE post SET status = \"PUBLISHED\" WHERE id = $after.post_id
@@ -646,8 +646,8 @@ DEFINE TABLE unpublish_post SCHEMALESS
         FOR select, create FULL
         FOR update, delete NONE;
 
-DEFINE FIELD post_id ON unpublish_post TYPE record(post);
-DEFINE FIELD created_at ON unpublish_post TYPE datetime VALUE $before OR time::now();
+DEFINE FIELD post_id ON unpublish_post TYPE record<post>;
+DEFINE FIELD created_at ON unpublish_post TYPE datetime DEFAULT time::now();
 
 DEFINE EVENT unpublish_post ON TABLE unpublish_post WHEN $event == \"CREATE\" THEN (
     UPDATE post SET status = \"DRAFT\" WHERE id = $after.post_id
@@ -659,7 +659,7 @@ const SECOND_MIGRATION_SCHEMAS: &str = "--- original
 +DEFINE TABLE category SCHEMALESS;
 +
 +DEFINE FIELD name ON category TYPE string;
-+DEFINE FIELD created_at ON category TYPE datetime VALUE $before OR time::now();
++DEFINE FIELD created_at ON category TYPE datetime DEFAULT time::now();
  # in: user
  # out: post, comment
  DEFINE TABLE comment SCHEMALESS\n";
@@ -672,7 +672,7 @@ const THIRD_MIGRATION_SCHEMAS: &str = "--- original
 +DEFINE FIELD name ON archive TYPE string;
 +DEFINE FIELD from_date ON archive TYPE datetime;
 +DEFINE FIELD to_date ON archive TYPE datetime;
-+DEFINE FIELD created_at ON archive TYPE datetime VALUE $before OR time::now();
++DEFINE FIELD created_at ON archive TYPE datetime DEFAULT time::now();
  DEFINE TABLE category SCHEMALESS;
 
  DEFINE FIELD name ON category TYPE string;\n";

tests/cli/apply/up.rs

@@ -1,5 +1,6 @@
 use anyhow::{ensure, Result};
 use assert_fs::TempDir;
+use predicates::prelude::*;
 
 use crate::helpers::*;
 
@@ -37,12 +38,9 @@ fn cannot_apply_if_surreal_instance_not_running() -> Result<()> {
 
     cmd.arg("apply");
 
-    cmd.assert().failure().stderr(
-        "Error: There was an error processing a remote WS request
-
-Caused by:
-    There was an error processing a remote WS request\n",
-    );
+    cmd.assert().failure().stderr(predicate::str::contains(
+        "Error: There was an error processing a remote WS request",
+    ));
 
     Ok(())
 }

tests/cli/branch/diff.rs

@@ -60,7 +60,7 @@ async fn diff_with_changes() -> Result<()> {
 ## category ##
 
 DEFINE TABLE category SCHEMALESS
-DEFINE FIELD created_at ON category TYPE datetime VALUE $before OR time::now()
+DEFINE FIELD created_at ON category TYPE datetime DEFAULT time::now()
 DEFINE FIELD name ON category TYPE string\n",
         )
     })?;

tests/cli/definitions.rs

@@ -159,15 +159,15 @@ DEFINE TABLE comment SCHEMALESS
         FOR create WHERE permission:create_comment IN $auth.permissions
         FOR update, delete WHERE in = $auth.id;
 
-DEFINE FIELD content ON comment TYPE string ASSERT $value != NONE;
-DEFINE FIELD created_at ON comment TYPE datetime VALUE $before OR time::now();
+DEFINE FIELD content ON comment TYPE string;
+DEFINE FIELD created_at ON comment TYPE datetime DEFAULT time::now();
 DEFINE TABLE permission SCHEMAFULL
     PERMISSIONS
         FOR select FULL
         FOR create, update, delete NONE;
 
 DEFINE FIELD name ON permission TYPE string;
-DEFINE FIELD created_at ON permission TYPE datetime VALUE $before OR time::now();
+DEFINE FIELD created_at ON permission TYPE datetime DEFAULT time::now();
 
 DEFINE INDEX unique_name ON permission COLUMNS name UNIQUE;
 DEFINE TABLE post SCHEMALESS
@@ -178,30 +178,30 @@ DEFINE TABLE post SCHEMALESS
 
 DEFINE FIELD title ON post TYPE string;
 DEFINE FIELD content ON post TYPE string;
-DEFINE FIELD author ON post TYPE record (user) ASSERT $value != NONE;
-DEFINE FIELD created_at ON post TYPE datetime VALUE $before OR time::now();
-DEFINE FIELD status ON post TYPE string VALUE $value OR $before OR 'DRAFT' ASSERT $value == NONE OR $value INSIDE ['DRAFT', 'PUBLISHED'];
+DEFINE FIELD author ON post TYPE record<user>;
+DEFINE FIELD created_at ON post TYPE datetime DEFAULT time::now();
+DEFINE FIELD status ON post TYPE string DEFAULT 'DRAFT' ASSERT $value IN ['DRAFT', 'PUBLISHED'];
 DEFINE TABLE script_migration SCHEMAFULL
     PERMISSIONS
         FOR select FULL
         FOR create, update, delete NONE;
 
 DEFINE FIELD script_name ON script_migration TYPE string;
-DEFINE FIELD executed_at ON script_migration TYPE datetime VALUE $before OR time::now();
+DEFINE FIELD executed_at ON script_migration TYPE datetime DEFAULT time::now();
 DEFINE TABLE user SCHEMAFULL
     PERMISSIONS
         FOR select FULL
         FOR update WHERE id = $auth.id
         FOR create, delete NONE;
 
-DEFINE FIELD username ON user TYPE string ASSERT $value != NONE;
-DEFINE FIELD email ON user TYPE string ASSERT is::email($value);
-DEFINE FIELD password ON user TYPE string ASSERT $value != NONE;
-DEFINE FIELD registered_at ON user TYPE datetime VALUE $before OR time::now();
-DEFINE FIELD avatar ON user TYPE string;
+DEFINE FIELD username ON user TYPE string;
+DEFINE FIELD email ON user TYPE string ASSERT string::is::email($value);
+DEFINE FIELD password ON user TYPE string;
+DEFINE FIELD registered_at ON user TYPE datetime DEFAULT time::now();
+DEFINE FIELD avatar ON user TYPE option<string>;
 
-DEFINE FIELD permissions ON user TYPE array VALUE [permission:create_post, permission:create_comment];
-DEFINE FIELD permissions.* ON user TYPE record (permission);
+DEFINE FIELD permissions ON user TYPE array<record<permission>> 
+    DEFAULT [permission:create_post, permission:create_comment];
 
 DEFINE INDEX unique_username ON user COLUMNS username UNIQUE;
 DEFINE INDEX unique_email ON user COLUMNS email UNIQUE;

tests/helpers/io.rs

@@ -192,7 +192,7 @@ pub fn add_category_schema_file(path: &Path) -> Result<()> {
         const CONTENT: &str = "DEFINE TABLE category SCHEMALESS;
 
 DEFINE FIELD name ON category TYPE string;
-DEFINE FIELD created_at ON category TYPE datetime VALUE $before OR time::now();";
+DEFINE FIELD created_at ON category TYPE datetime DEFAULT time::now();";
 
         fs::write(schema_file, CONTENT)?;
     }
@@ -252,7 +252,7 @@ pub fn add_archive_schema_file(path: &Path) -> Result<()> {
 DEFINE FIELD name ON archive TYPE string;
 DEFINE FIELD from_date ON archive TYPE datetime;
 DEFINE FIELD to_date ON archive TYPE datetime;
-DEFINE FIELD created_at ON archive TYPE datetime VALUE $before OR time::now();";
+DEFINE FIELD created_at ON archive TYPE datetime DEFAULT time::now();";
 
         fs::write(schema_file, CONTENT)?;
     }
@@ -262,7 +262,7 @@ DEFINE FIELD created_at ON archive TYPE datetime VALUE $before OR time::now();";
 
 pub fn add_archive_migration_file(path: &Path) -> Result<()> {
     let content =
-        "CREATE archive SET name = '2022', from_date = '2022-01-01', to_date = '2022-12-31';";
+        "CREATE archive SET name = '2022', from_date = '2022-01-01T00:00:00Z', to_date = '2022-12-31T00:00:00Z';";
 
     let mut cmd = create_cmd(path)?;
     cmd.arg("create")