msi 2: Allow non-key columns to be used with the join query

[James Hawkins]

Hi,

This fixes bug 4632.  http://bugs.winehq.org/show_bug.cgi?id=4632

Changelog:
* Allow non-key columns to be used with the join query.

 dlls/msi/join.c     |    3 ---
 dlls/msi/tests/db.c |   15 +++------------
 2 files changed, 3 insertions(+), 15 deletions(-)

-- 
James Hawkins
-------------- next part --------------
diff --git a/dlls/msi/join.c b/dlls/msi/join.c
index 17f04c0..c3cb40f 100644
--- a/dlls/msi/join.c
+++ b/dlls/msi/join.c
@@ -393,9 +393,6 @@ static UINT join_check_condition(MSIJOIN
     if (r != ERROR_SUCCESS)
         return ERROR_FUNCTION_FAILED;
 
-    if (!(type & MSITYPE_KEY))
-        return ERROR_FUNCTION_FAILED;
-
     r = jv->right->ops->get_column_info( jv->right, jv->right_key, NULL, &type );
     if (r != ERROR_SUCCESS)
         return ERROR_FUNCTION_FAILED;
diff --git a/dlls/msi/tests/db.c b/dlls/msi/tests/db.c
index 7316fb4..531f0d1 100644
--- a/dlls/msi/tests/db.c
+++ b/dlls/msi/tests/db.c
@@ -1834,16 +1834,10 @@ static void test_join(void)
             "WHERE `StdDlls`.`Binary_` = `Binary`.`Name` "
             "ORDER BY `File`";
     r = MsiDatabaseOpenView(hdb, query, &hview);
-    todo_wine
-    {
-        ok( r == ERROR_SUCCESS, "failed to open view: %d\n", r );
-    }
+    ok( r == ERROR_SUCCESS, "failed to open view: %d\n", r );
 
     r = MsiViewExecute(hview, 0);
-    todo_wine
-    {
-        ok( r == ERROR_SUCCESS, "failed to execute view: %d\n", r );
-    }
+    ok( r == ERROR_SUCCESS, "failed to execute view: %d\n", r );
 
     i = 0;
     while ((r = MsiViewFetch(hview, &hrec)) == ERROR_SUCCESS)
@@ -1867,10 +1861,7 @@ static void test_join(void)
         MsiCloseHandle(hrec);
     }
 
-    todo_wine
-    {
-        ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r );
-    }
+    ok( r == ERROR_NO_MORE_ITEMS, "expected no more items: %d\n", r );
 
     MsiViewClose(hview);
     MsiCloseHandle(hview);
-- 
1.4.2