properly handle the error and its passsing to pygeodiff

Author: JanCaha

geodiff/src/geodiff.cpp

@@ -158,7 +158,14 @@ int GEODIFF_CX_setTablesToSkip( GEODIFF_ContextH contextHandle, int tablesCount,
     tables.push_back( tableName );
   }
 
-  context->setTablesToSkip( tables );
+  try
+  {
+    context->setTablesToSkip( tables );
+  }
+  catch ( const GeoDiffException &exc )
+  {
+    return handleException( context, exc );
+  }
   return GEODIFF_SUCCESS;
 }
 
@@ -182,7 +189,14 @@ int GEODIFF_CX_setTablesToInclude( GEODIFF_ContextH contextHandle, int tablesCou
     tables.push_back( tablesToInclude[i] );
   }
 
-  context->setTablesToInclude( tables );
+  try
+  {
+    context->setTablesToInclude( tables );
+  }
+  catch ( const GeoDiffException &exc )
+  {
+    return handleException( context, exc );
+  }
   return GEODIFF_SUCCESS;
 }
 

pygeodiff/geodifflib.py

@@ -248,18 +248,20 @@ def set_tables_to_skip(self, context, tables):
         for i in range(len(tables)):
             arr[i] = tables[i].encode("utf-8")
 
-        self.lib.GEODIFF_CX_setTablesToSkip(
-            ctypes.c_void_p(context), ctypes.c_int(len(tables)), arr
-        )
+        func = self.lib.GEODIFF_CX_setTablesToSkip
+        func.restype = ctypes.c_int
+        rc = func(ctypes.c_void_p(context), ctypes.c_int(len(tables)), arr)
+        self._parse_return_code(context, rc, "set_tables_to_skip")
 
     def set_tables_to_include(self, context, tables):
         arr = (ctypes.c_char_p * len(tables))()
         for i in range(len(tables)):
             arr[i] = tables[i].encode("utf-8")
 
-        self.lib.GEODIFF_CX_setTablesToInclude(
-            ctypes.c_void_p(context), ctypes.c_int(len(tables)), arr
-        )
+        func = self.lib.GEODIFF_CX_setTablesToInclude
+        func.restype = ctypes.c_int
+        rc = func(ctypes.c_void_p(context), ctypes.c_int(len(tables)), arr)
+        self._parse_return_code(context, rc, "set_tables_to_include")
 
     def version(self):
         func = self.lib.GEODIFF_version

pygeodiff/tests/test_skip_tables.py

@@ -13,6 +13,7 @@
     geodiff_test_dir,
     tmpdir,
 )
+from pygeodiff import GeoDiffLibError
 
 
 class UnitTestsPythonSingleCommit(GeoDiffTests):
@@ -183,3 +184,14 @@ def test_include_apply(self):
         check_nchanges(self.geodiff, changeset2, 0)
 
         self.geodiff.set_tables_to_include([])
+
+    def test_skip_and_include_raises_error(self):
+        with self.assertRaises(GeoDiffLibError):
+            self.geodiff.set_tables_to_skip(["lines"])
+            self.geodiff.set_tables_to_include(["points"])
+
+    def test_include_and_skip_raises_error(self):
+        with self.assertRaises(GeoDiffLibError):
+            self.geodiff.set_tables_to_include(["points"])
+            self.geodiff.set_tables_to_skip(["lines"])
+