database: make merge() GObject-like

3 files changed, 55 insertions, 62 deletions

diff --git a/include/libmsi-database.h b/include/libmsi-database.h
index bd1e5f3..a43d86e 100644
--- a/include/libmsi-database.h
+++ b/include/libmsi-database.h
@@ -61,8 +61,12 @@ gboolean            libmsi_database_import              (LibmsiDatabase *db,
                                                          const char *folder,
                                                          const char *filename,
                                                          GError **error);
-LibmsiCondition     libmsi_database_is_table_persistent (LibmsiDatabase *, const char *);
-LibmsiResult        libmsi_database_merge (LibmsiDatabase *, LibmsiDatabase *, const char *);
+LibmsiCondition     libmsi_database_is_table_persistent (LibmsiDatabase *db,
+                                                         const char *table);
+gboolean            libmsi_database_merge               (LibmsiDatabase *db,
+                                                         LibmsiDatabase *merge,
+                                                         const char *table,
+                                                         GError **error);
 LibmsiResult        libmsi_database_get_summary_info (LibmsiDatabase *, unsigned, LibmsiSummaryInfo **);
 LibmsiResult        libmsi_database_commit (LibmsiDatabase *);
 
diff --git a/libmsi/libmsi-database.c b/libmsi/libmsi-database.c
index 70d39b9..470dacc 100644
--- a/libmsi/libmsi-database.c
+++ b/libmsi/libmsi-database.c
@@ -1974,8 +1974,11 @@ static unsigned update_merge_errors(LibmsiDatabase *db, const char *error,
     return r;
 }
 
-LibmsiResult libmsi_database_merge(LibmsiDatabase *db, LibmsiDatabase *merge,
-                              const char *szTableName)
+gboolean
+libmsi_database_merge (LibmsiDatabase *db,
+                       LibmsiDatabase *merge,
+                       const char *tablename,
+                       GError **error)
 {
     struct list tabledata = LIST_INIT(tabledata);
     struct list *item, *cursor;
@@ -1984,13 +1987,11 @@ LibmsiResult libmsi_database_merge(LibmsiDatabase *db, LibmsiDatabase *merge,
     unsigned r;
 
     TRACE("(%d, %d, %s)\n", db, merge,
-          debugstr_a(szTableName));
-
-    if (szTableName && !*szTableName)
-        return LIBMSI_RESULT_INVALID_TABLE;
+          debugstr_a(tablename));
 
-    if (!db || !merge)
-        return LIBMSI_RESULT_INVALID_HANDLE;
+    g_return_val_if_fail (LIBMSI_IS_DATABASE (db), FALSE);
+    g_return_val_if_fail (LIBMSI_IS_DATABASE (merge), FALSE);
+    g_return_val_if_fail (!tablename || *tablename, FALSE);
 
     g_object_ref(db);
     g_object_ref(merge);
@@ -2005,7 +2006,7 @@ LibmsiResult libmsi_database_merge(LibmsiDatabase *db, LibmsiDatabase *merge,
         {
             conflicts = true;
 
-            r = update_merge_errors(db, szTableName, table->name,
+            r = update_merge_errors(db, tablename, table->name,
                                     table->numconflicts);
             if (r != LIBMSI_RESULT_SUCCESS)
                 break;
@@ -2029,9 +2030,11 @@ LibmsiResult libmsi_database_merge(LibmsiDatabase *db, LibmsiDatabase *merge,
         r = LIBMSI_RESULT_FUNCTION_FAILED;
 
 done:
+    if (r != LIBMSI_RESULT_SUCCESS)
+        g_set_error (error, LIBMSI_RESULT_ERROR, r, G_STRFUNC);
     g_object_unref(db);
     g_object_unref(merge);
-    return r;
+    return r == LIBMSI_RESULT_SUCCESS;
 }
 
 LibmsiDBState libmsi_database_get_state( LibmsiDatabase *db )
diff --git a/tests/testdatabase.c b/tests/testdatabase.c
index 8386dbf..7652e24 100644
--- a/tests/testdatabase.c
+++ b/tests/testdatabase.c
@@ -6055,6 +6055,7 @@ static void test_droptable(void)
 
 static void test_dbmerge(void)
 {
+    GError *error = NULL;
     LibmsiDatabase *hdb;
     LibmsiDatabase *href;
     LibmsiQuery *hquery;
@@ -6070,27 +6071,13 @@ static void test_dbmerge(void)
     href = libmsi_database_new("refdb.msi", LIBMSI_DB_OPEN_CREATE, NULL);
     ok(href, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    /* hDatabase is invalid */
-    r = libmsi_database_merge(0, href, "MergeErrors");
-    ok(r == LIBMSI_RESULT_INVALID_HANDLE,
-       "Expected LIBMSI_RESULT_INVALID_HANDLE, got %d\n", r);
-
-    /* hDatabaseMerge is invalid */
-    r = libmsi_database_merge(hdb, 0, "MergeErrors");
-    ok(r == LIBMSI_RESULT_INVALID_HANDLE,
-       "Expected LIBMSI_RESULT_INVALID_HANDLE, got %d\n", r);
-
     /* szTableName is NULL */
-    r = libmsi_database_merge(hdb, href, NULL);
-    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
-
-    /* szTableName is empty */
-    r = libmsi_database_merge(hdb, href, "");
-    ok(r == LIBMSI_RESULT_INVALID_TABLE, "Expected LIBMSI_RESULT_INVALID_TABLE, got %d\n", r);
+    r = libmsi_database_merge(hdb, href, NULL, &error);
+    ok(r, "libmsi_database_merge() failed");
 
     /* both DBs empty, szTableName is valid */
-    r = libmsi_database_merge(hdb, href, "MergeErrors");
-    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
+    r = libmsi_database_merge(hdb, href, "MergeErrors", &error);
+    ok(r, "libmsi_database_merge() failed");
 
     sql = "CREATE TABLE `One` ( `A` INT PRIMARY KEY `A` )";
     r = run_query(hdb, 0, sql);
@@ -6101,9 +6088,9 @@ static void test_dbmerge(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
     /* column types don't match */
-    r = libmsi_database_merge(hdb, href, "MergeErrors");
-    ok(r == LIBMSI_RESULT_DATATYPE_MISMATCH,
-       "Expected LIBMSI_RESULT_DATATYPE_MISMATCH, got %d\n", r);
+    r = libmsi_database_merge(hdb, href, "MergeErrors", &error);
+    g_assert_error(error, LIBMSI_RESULT_ERROR, LIBMSI_RESULT_DATATYPE_MISMATCH);
+    g_clear_error(&error);
 
     /* nothing in MergeErrors */
     sql = "SELECT * FROM `MergeErrors`";
@@ -6146,9 +6133,8 @@ static void test_dbmerge(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
     /* column sting types don't match exactly */
-    r = libmsi_database_merge(hdb, href, "MergeErrors");
-    ok(r == LIBMSI_RESULT_SUCCESS,
-       "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
+    r = libmsi_database_merge(hdb, href, "MergeErrors", &error);
+    ok(r, "libmsi_database_merge() failed");
 
     /* nothing in MergeErrors */
     sql = "SELECT * FROM `MergeErrors`";
@@ -6173,9 +6159,9 @@ static void test_dbmerge(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
     /* column names don't match */
-    r = libmsi_database_merge(hdb, href, "MergeErrors");
-    ok(r == LIBMSI_RESULT_DATATYPE_MISMATCH,
-       "Expected LIBMSI_RESULT_DATATYPE_MISMATCH, got %d\n", r);
+    r = libmsi_database_merge(hdb, href, "MergeErrors", &error);
+    g_assert_error(error, LIBMSI_RESULT_ERROR, LIBMSI_RESULT_DATATYPE_MISMATCH);
+    g_clear_error(&error);
 
     /* nothing in MergeErrors */
     sql = "SELECT * FROM `MergeErrors`";
@@ -6200,9 +6186,9 @@ static void test_dbmerge(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
     /* primary keys don't match */
-    r = libmsi_database_merge(hdb, href, "MergeErrors");
-    ok(r == LIBMSI_RESULT_DATATYPE_MISMATCH,
-       "Expected LIBMSI_RESULT_DATATYPE_MISMATCH, got %d\n", r);
+    r = libmsi_database_merge(hdb, href, "MergeErrors", &error);
+    g_assert_error(error, LIBMSI_RESULT_ERROR, LIBMSI_RESULT_DATATYPE_MISMATCH);
+    g_clear_error(&error);
 
     /* nothing in MergeErrors */
     sql = "SELECT * FROM `MergeErrors`";
@@ -6227,9 +6213,9 @@ static void test_dbmerge(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
     /* number of primary keys doesn't match */
-    r = libmsi_database_merge(hdb, href, "MergeErrors");
-    ok(r == LIBMSI_RESULT_DATATYPE_MISMATCH,
-       "Expected LIBMSI_RESULT_DATATYPE_MISMATCH, got %d\n", r);
+    r = libmsi_database_merge(hdb, href, "MergeErrors", &error);
+    g_assert_error(error, LIBMSI_RESULT_ERROR, LIBMSI_RESULT_DATATYPE_MISMATCH);
+    g_clear_error(&error);
 
     /* nothing in MergeErrors */
     sql = "SELECT * FROM `MergeErrors`";
@@ -6258,8 +6244,8 @@ static void test_dbmerge(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
     /* number of columns doesn't match */
-    r = libmsi_database_merge(hdb, href, "MergeErrors");
-    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
+    r = libmsi_database_merge(hdb, href, "MergeErrors", NULL);
+    ok(r, "libmsi_database_merge() failed");
 
     sql = "SELECT * FROM `One`";
     r = do_query(hdb, sql, &hrec);
@@ -6303,8 +6289,8 @@ static void test_dbmerge(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
     /* number of columns doesn't match */
-    r = libmsi_database_merge(hdb, href, "MergeErrors");
-    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
+    r = libmsi_database_merge(hdb, href, "MergeErrors", NULL);
+    ok(r, "libmsi_database_merge() failed");
 
     sql = "SELECT * FROM `One`";
     r = do_query(hdb, sql, &hrec);
@@ -6360,9 +6346,9 @@ static void test_dbmerge(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
     /* primary keys match, rows do not */
-    r = libmsi_database_merge(hdb, href, "MergeErrors");
-    ok(r == LIBMSI_RESULT_FUNCTION_FAILED,
-       "Expected LIBMSI_RESULT_FUNCTION_FAILED, got %d\n", r);
+    r = libmsi_database_merge(hdb, href, "MergeErrors", &error);
+    g_assert_error(error, LIBMSI_RESULT_ERROR, LIBMSI_RESULT_FUNCTION_FAILED);
+    g_clear_error(&error);
 
     /* nothing in MergeErrors */
     sql = "SELECT * FROM `MergeErrors`";
@@ -6417,8 +6403,8 @@ static void test_dbmerge(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
     /* table from merged database is not in target database */
-    r = libmsi_database_merge(hdb, href, "MergeErrors");
-    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
+    r = libmsi_database_merge(hdb, href, "MergeErrors", NULL);
+    ok(r, "libmsi_database_merge() failed\n");
 
     sql = "SELECT * FROM `One`";
     r = do_query(hdb, sql, &hrec);
@@ -6459,8 +6445,8 @@ static void test_dbmerge(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
     /* primary key is string */
-    r = libmsi_database_merge(hdb, href, "MergeErrors");
-    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
+    r = libmsi_database_merge(hdb, href, "MergeErrors", NULL);
+    ok(r, "libmsi_database_merge() failed\n");
 
     sql = "SELECT * FROM `One`";
     r = do_query(hdb, sql, &hrec);
@@ -6507,8 +6493,8 @@ static void test_dbmerge(void)
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
     /* code page does not match */
-    r = libmsi_database_merge(hdb, href, "MergeErrors");
-    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
+    r = libmsi_database_merge(hdb, href, "MergeErrors", NULL);
+    ok(r, "libmsi_database_merge() failed\n");
 
     sql = "SELECT * FROM `One`";
     r = do_query(hdb, sql, &hrec);
@@ -6553,8 +6539,8 @@ static void test_dbmerge(void)
     g_object_unref(hrec);
 
     /* binary data to merge */
-    r = libmsi_database_merge(hdb, href, "MergeErrors");
-    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
+    r = libmsi_database_merge(hdb, href, "MergeErrors", NULL);
+    ok(r, "libmsi_database_merge() failed\n");
 
     sql = "SELECT * FROM `One`";
     r = do_query(hdb, sql, &hrec);
@@ -6600,8 +6586,8 @@ static void test_dbmerge(void)
     r = run_query(href, 0, sql);
     ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
 
-    r = libmsi_database_merge(hdb, href, "MergeErrors");
-    ok(r == LIBMSI_RESULT_SUCCESS, "Expected LIBMSI_RESULT_SUCCESS, got %d\n", r);
+    r = libmsi_database_merge(hdb, href, "MergeErrors", NULL);
+    ok(r, "libmsi_database_merge() failed\n");
 
     sql = "SELECT * FROM `One`";
     hquery = libmsi_query_new(hdb, sql, NULL);