Patch for bug 20227: msi: Table Join on two tables that have same (non-join) column name...

[Nathan Gallaher]

Resubmit of patch.

Patch separated into test and fix components.
Patch rebased.
tableName variable --> table_name
Commented code removed.
Unused variables removed
Unnecessary debug printf's removed.

Thanks for the review,

~Nate

On Thu, 1 Oct 2009, Hans Leidekker wrote:

> Hi Nate,
>
> Your patch applies with offsets, please rebase to current git.
> And get rid of this warning:
>
> db.c: In function ‘test_where_not_in_selected’:
> db.c:1576: warning: unused variable ‘count’
>
>> +    query = /*"Select IESTable.Action, IESTable.Condition from CATable, IESTable where "*/
>> +            "Select IESTable.Condition from CATable, IESTable where "
>> +                      //"CATable.Action = IESTable.Action and (CATable.Type = 51 or CATable.Type = 32) "
>> +                      "CATable.Action = IESTable.Action and CATable.Type = 32 "
>> +                      /*"order by IESTable.Sequence"*/;
>
> Please remove the commented strings.
>
>>  static UINT ALTER_get_column_info( struct tagMSIVIEW *view,
>> -                UINT n, LPWSTR *name, UINT *type, BOOL *temporary )
>> +                UINT n, LPWSTR *name, UINT *type, BOOL *temporary,
>> +                LPWSTR *tableName)
>
> 'table_name' or just 'table' would be more in keeping with the existing style.
>
>> +    printf("Returned entry: %s\n", buf);
>
> trace() is usually used for debug printing but you might want to turn this
> into a test instead, or just leave it out. And you should split off the tests
> to keep the patch size down.
>
> -Hans
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0002-Test-for-bug-20227.patch
Type: text/x-diff
Size: 4742 bytes
Desc: 
URL: <http://www.winehq.org/pipermail/wine-devel/attachments/20091018/1f3aadbf/attachment-0002.patch>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Add-tablename-tracking-to-VIEW_find_column.patch
Type: text/x-diff
Size: 21518 bytes
Desc: 
URL: <http://www.winehq.org/pipermail/wine-devel/attachments/20091018/1f3aadbf/attachment-0003.patch>