lib: add new status code for query syntax errors.

This will help provide more meaningful error messages without special
casing on the client side.

diff --git a/bindings/python-cffi/notmuch2/_build.py b/bindings/python-cffi/notmuch2/_build.py
index f712b6c5e4243b00f95267d5b582ec3bb964cac6..24df939e4235ac1c8f9d302fccb6fc79a437b02d 100644 (file)
--- a/bindings/python-cffi/notmuch2/_build.py
+++ b/bindings/python-cffi/notmuch2/_build.py
@@ -53,6 +53,7 @@ ffibuilder.cdef(
         NOTMUCH_STATUS_NO_CONFIG,
         NOTMUCH_STATUS_NO_DATABASE,
         NOTMUCH_STATUS_DATABASE_EXISTS,
         NOTMUCH_STATUS_NO_CONFIG,
         NOTMUCH_STATUS_NO_DATABASE,
         NOTMUCH_STATUS_DATABASE_EXISTS,

+        NOTMUCH_STATUS_BAD_QUERY_SYNTAX,

         NOTMUCH_STATUS_LAST_STATUS
     } notmuch_status_t;
     typedef enum {
         NOTMUCH_STATUS_LAST_STATUS
     } notmuch_status_t;
     typedef enum {

diff --git a/bindings/python-cffi/notmuch2/_errors.py b/bindings/python-cffi/notmuch2/_errors.py
index 9301073ed7668836f74c68f1cc0f3503b772af46..f55cc96b53bf44ba69cbbd0b5774626fc8006632 100644 (file)
--- a/bindings/python-cffi/notmuch2/_errors.py
+++ b/bindings/python-cffi/notmuch2/_errors.py
@@ -56,6 +56,8 @@ class NotmuchError(Exception):
                 NoDatabaseError,
             capi.lib.NOTMUCH_STATUS_DATABASE_EXISTS:
                 DatabaseExistsError,
                 NoDatabaseError,
             capi.lib.NOTMUCH_STATUS_DATABASE_EXISTS:
                 DatabaseExistsError,

+            capi.lib.NOTMUCH_STATUS_BAD_QUERY_SYNTAX:
+                QuerySyntaxError,

         }
         return types[status]
 
         }
         return types[status]
 


@@ -103,6 +105,7 @@ class IllegalArgumentError(NotmuchError): pass
 class NoConfigError(NotmuchError): pass
 class NoDatabaseError(NotmuchError): pass
 class DatabaseExistsError(NotmuchError): pass
 class NoConfigError(NotmuchError): pass
 class NoDatabaseError(NotmuchError): pass
 class DatabaseExistsError(NotmuchError): pass

+class QuerySyntaxError(NotmuchError): pass

 
 class ObjectDestroyedError(NotmuchError):
     """The object has already been destroyed and it's memory freed.
 
 class ObjectDestroyedError(NotmuchError):
     """The object has already been destroyed and it's memory freed.

diff --git a/lib/database.cc b/lib/database.cc
index 31794900a392194e641675b2ec15df3214b075f8..7eb0de79ee288ce704e302d6dde73d66a9722535 100644 (file)
--- a/lib/database.cc
+++ b/lib/database.cc
@@ -309,6 +309,8 @@ notmuch_status_to_string (notmuch_status_t status)
        return "No database found";
     case NOTMUCH_STATUS_DATABASE_EXISTS:
        return "Database exists, not recreated";
        return "No database found";
     case NOTMUCH_STATUS_DATABASE_EXISTS:
        return "Database exists, not recreated";

+    case NOTMUCH_STATUS_BAD_QUERY_SYNTAX:
+       return "Syntax error in query";

     default:
     case NOTMUCH_STATUS_LAST_STATUS:
        return "Unknown error status value";
     default:
     case NOTMUCH_STATUS_LAST_STATUS:
        return "Unknown error status value";

diff --git a/lib/notmuch.h b/lib/notmuch.h
index 2f1ee9518c5aeec0acbefdf5d1cd38212cf51d11..546643e80cbb66364b2502f6b8046291959d9d8b 100644 (file)
--- a/lib/notmuch.h
+++ b/lib/notmuch.h
@@ -220,6 +220,10 @@ typedef enum _notmuch_status {
      * Database exists, so not (re)-created
      */
     NOTMUCH_STATUS_DATABASE_EXISTS,
      * Database exists, so not (re)-created
      */
     NOTMUCH_STATUS_DATABASE_EXISTS,

+    /**
+     * Syntax error in query
+     */
+    NOTMUCH_STATUS_BAD_QUERY_SYNTAX,

     /**
      * Not an actual status value. Just a way to find out how many
      * valid status values there are.
     /**
      * Not an actual status value. Just a way to find out how many
      * valid status values there are.