Commit 0fd49432 authored by Bernhard Loos's avatar Bernhard Loos Committed by Alexandre Julliard

msi: Get rid of JOINVIEW.

parent 4383aafa
......@@ -24,7 +24,6 @@ C_SRCS = \
handle.c \
insert.c \
install.c \
join.c \
media.c \
msi.c \
msi_main.c \
......
......@@ -123,8 +123,6 @@ UINT UPDATE_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR table,
UINT DELETE_CreateView( MSIDATABASE *db, MSIVIEW **view, MSIVIEW *table ) DECLSPEC_HIDDEN;
UINT JOIN_CreateView( MSIDATABASE *db, MSIVIEW **view, LPWSTR tables ) DECLSPEC_HIDDEN;
UINT ALTER_CreateView( MSIDATABASE *db, MSIVIEW **view, LPCWSTR name, column_info *colinfo, int hold ) DECLSPEC_HIDDEN;
UINT STREAMS_CreateView( MSIDATABASE *db, MSIVIEW **view ) DECLSPEC_HIDDEN;
......
......@@ -490,6 +490,18 @@ from:
PARSER_BUBBLE_UP_VIEW( sql, $$, where );
}
| TK_FROM tablelist
{
SQL_input* sql = (SQL_input*) info;
MSIVIEW* where = NULL;
UINT r;
r = WHERE_CreateView( sql->db, &where, $2, NULL );
if( r != ERROR_SUCCESS )
YYABORT;
PARSER_BUBBLE_UP_VIEW( sql, $$, where );
}
;
fromtable:
......@@ -505,18 +517,6 @@ fromtable:
PARSER_BUBBLE_UP_VIEW( sql, $$, table );
}
| TK_FROM tablelist
{
SQL_input* sql = (SQL_input*) info;
MSIVIEW* join = NULL;
UINT r;
r = JOIN_CreateView( sql->db, &join, $2 );
if( r != ERROR_SUCCESS )
YYABORT;
PARSER_BUBBLE_UP_VIEW( sql, $$, join );
}
;
tablelist:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment