Spell mistake and err() nil on success

thingsdb · Feb 7, 2024 · e59386d · e59386d
1 parent 7f26130
commit e59386d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -32,6 +32,8 @@
 * Added set operators `<=`, `<`, `>=`, `>` for subset, proper subset, superset and proper superset checking.
 * Added range `<..>` support for UTF8 type property definitions.
 * Added bitwise NOT (`~`) operator.
+* Return `nil` instead of success error when a repeating task is successful.
+* Corrected a spelling mistake in error message for integer range values.
 
 # v1.4.16
 

diff --git a/inc/ti/fn/fnerr.h b/inc/ti/fn/fnerr.h
@@ -13,7 +13,7 @@ static int do__f_err_task(ti_query_t * query, cleri_node_t * nd, ex_t * e)
     if (fn_nargs("err", DOC_TASK_ERR, 0, nargs, e))
         return e->nr;
 
-    if (vtask->verr)
+    if (vtask->verr && vtask->verr->code)
     {
         query->rval = (ti_val_t *) vtask->verr;
         ti_incref(query->rval);

diff --git a/inc/ti/version.h b/inc/ti/version.h
@@ -25,7 +25,7 @@
  *  "-rc0"
  *  ""
  */
-#define TI_VERSION_PRE_RELEASE "-alpha13"
+#define TI_VERSION_PRE_RELEASE "-alpha14"
 
 #define TI_MAINTAINER \
     "Jeroen van der Heijden <jeroen@cesbit.com>"

diff --git a/itest/test_advanced.py b/itest/test_advanced.py
@@ -710,7 +710,7 @@ async def test_conditions(self, client):
         with self.assertRaisesRegex(
                 ValueError,
                 r'mismatch in type `Foo`; '
-                r'property `int_a` requires a float value between '
+                r'property `int_a` requires an integer value between '
                 r'0 and 10 \(both inclusive\)'):
             await client.query(r'''
                 Foo{int_a: -1};
@@ -719,7 +719,7 @@ async def test_conditions(self, client):
         with self.assertRaisesRegex(
                 ValueError,
                 r'mismatch in type `Foo`; '
-                r'property `int_a` requires a float value between '
+                r'property `int_a` requires an integer value between '
                 r'0 and 10 \(both inclusive\)'):
             await client.query(r'''
                 Foo{int_a: 11};

diff --git a/src/ti/field.c b/src/ti/field.c
@@ -1863,7 +1863,7 @@ int ti_field_make_assignable(
 irange_error:
     ex_set(e, EX_VALUE_ERROR,
             "mismatch in type `%s`; "
-            "property `%s` requires a float value between "
+            "property `%s` requires an integer value between "
             "%"PRId64" and %"PRId64" (both inclusive)",
             field->type->name,
             field->name->str,