msi: Add support for table names in select statements.

Propagate tablename from 'SELECT tablename.column from tablename' queries into VIEW_find_column(). Previously, the tablename had been dropped.

msi: Add support for table names in select statements.
5c56e1f4 · Nathan Gallaher · Alexandre Julliard · 51000c17 · 5c56e1f4
Commit 5c56e1f4 authored Nov 09, 2009 by Nathan Gallaher Committed by Alexandre Julliard Nov 24, 2009
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

select.c dlls/msi/select.c +6 -4

No files found.
--- a/dlls/msi/select.c
+++ b/dlls/msi/select.c
@@ -368,12 +368,14 @@ static const MSIVIEWOPS select_ops =
    NULL,
 };

-static UINT SELECT_AddColumn( MSISELECTVIEW *sv, LPCWSTR name )
+static UINT SELECT_AddColumn( MSISELECTVIEW *sv, LPCWSTR name,
+                              LPCWSTR table_name )
 {
    UINT r, n=0;
    MSIVIEW *table;

-    TRACE("%p adding %s\n", sv, debugstr_w( name ) );
+    TRACE("%p adding %s.%s\n", sv, debugstr_w( table_name ),
+          debugstr_w( name ));

    if( sv->view.ops != &select_ops )
        return ERROR_FUNCTION_FAILED;
@@ -389,7 +391,7 @@ static UINT SELECT_AddColumn( MSISELECTVIEW *sv, LPCWSTR name )
    if( sv->num_cols >= sv->max_cols )
        return ERROR_FUNCTION_FAILED;

-    r = VIEW_find_column( table, name, NULL, &n );
+    r = VIEW_find_column( table, name, table_name, &n );
    if( r != ERROR_SUCCESS )
        return r;

@@ -433,7 +435,7 @@ UINT SELECT_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table,

    while( columns )
    {
-        r = SELECT_AddColumn( sv, columns->column );
+        r = SELECT_AddColumn( sv, columns->column, columns->table );
        if( r )
            break;
        columns = columns->next;