Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-cw
Commits
77d3c598
Commit
77d3c598
authored
Sep 08, 2006
by
Mike McCormack
Committed by
Alexandre Julliard
Sep 08, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
msi: Fix the TEMPORARY keyword for columns.
parent
14ab6230
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
6 deletions
+14
-6
sql.y
dlls/msi/sql.y
+6
-2
db.c
dlls/msi/tests/db.c
+7
-2
tokenize.c
dlls/msi/tokenize.c
+1
-2
No files found.
dlls/msi/sql.y
View file @
77d3c598
...
...
@@ -108,7 +108,7 @@ static struct expr * EXPR_wildcard( void *info );
%token TK_ROW TK_RP TK_RSHIFT
%token TK_SELECT TK_SEMI TK_SET TK_SHORT TK_SLASH TK_SPACE TK_STAR TK_STATEMENT
%token <str> TK_STRING
%token TK_TABLE TK_TEMP TK_THEN TK_TRANSACTION TK_TRIGGER
%token TK_TABLE TK_TEMP
ORARY
TK_THEN TK_TRANSACTION TK_TRIGGER
%token TK_UMINUS TK_UNCLOSED_STRING TK_UNION TK_UNIQUE
%token TK_UPDATE TK_UPLUS TK_USING
%token TK_VACUUM TK_VALUES TK_VIEW
...
...
@@ -171,7 +171,7 @@ oneinsert:
YYABORT;
$$ = insert;
}
| TK_INSERT TK_INTO table TK_LP selcollist TK_RP TK_VALUES TK_LP constlist TK_RP TK_TEMP
| TK_INSERT TK_INTO table TK_LP selcollist TK_RP TK_VALUES TK_LP constlist TK_RP TK_TEMP
ORARY
{
SQL_input *sql = (SQL_input*) info;
MSIVIEW *insert = NULL;
...
...
@@ -304,6 +304,10 @@ column_type:
{
$$ = $1 | MSITYPE_LOCALIZABLE;
}
| data_type_l TK_TEMPORARY
{
FIXME("temporary column\n");
}
;
data_type_l:
...
...
dlls/msi/tests/db.c
View file @
77d3c598
...
...
@@ -1955,27 +1955,29 @@ static void test_temporary_table(void)
todo_wine
{
cond
=
MsiDatabaseIsTablePersistent
(
hdb
,
"P"
);
ok
(
cond
==
MSICONDITION_TRUE
,
"wrong return condition
\n
"
);
}
query
=
"CREATE TABLE `T` ( `B` SHORT NOT NULL TEMPORARY, `C` CHAR(255) TEMPORARY PRIMARY KEY `C`) HOLD"
;
r
=
run_query
(
hdb
,
0
,
query
);
ok
(
r
==
ERROR_SUCCESS
,
"failed to add table
\n
"
);
}
cond
=
MsiDatabaseIsTablePersistent
(
hdb
,
"T"
);
ok
(
cond
==
MSICONDITION_FALSE
,
"wrong return condition
\n
"
);
todo_wine
{
query
=
"CREATE TABLE `T2` ( `B` SHORT NOT NULL TEMPORARY, `C` CHAR(255) TEMPORARY PRIMARY KEY `C`)"
;
r
=
run_query
(
hdb
,
0
,
query
);
ok
(
r
==
ERROR_SUCCESS
,
"failed to add table
\n
"
);
todo_wine
{
cond
=
MsiDatabaseIsTablePersistent
(
hdb
,
"T2"
);
ok
(
cond
==
MSICONDITION_NONE
,
"wrong return condition
\n
"
);
}
query
=
"CREATE TABLE `T3` ( `B` SHORT NOT NULL TEMPORARY, `C` CHAR(255) PRIMARY KEY `C`)"
;
r
=
run_query
(
hdb
,
0
,
query
);
ok
(
r
==
ERROR_SUCCESS
,
"failed to add table
\n
"
);
todo_wine
{
cond
=
MsiDatabaseIsTablePersistent
(
hdb
,
"T3"
);
ok
(
cond
==
MSICONDITION_TRUE
,
"wrong return condition
\n
"
);
...
...
@@ -1987,6 +1989,9 @@ static void test_temporary_table(void)
ok
(
cond
==
MSICONDITION_NONE
,
"wrong return condition
\n
"
);
}
query
=
"CREATE TABLE `T5` ( `B` SHORT NOT NULL TEMP, `C` CHAR(255) TEMP PRIMARY KEY `C`) HOLD"
;
r
=
run_query
(
hdb
,
0
,
query
);
ok
(
r
==
ERROR_BAD_QUERY_SYNTAX
,
"failed to add table
\n
"
);
MsiCloseHandle
(
hdb
);
DeleteFile
(
msifile
);
...
...
dlls/msi/tokenize.c
View file @
77d3c598
...
...
@@ -247,8 +247,7 @@ static const Keyword aKeywordTable[] = {
{
SHORT_W
,
TK_SHORT
},
{
STATEMENT_W
,
TK_STATEMENT
},
{
TABLE_W
,
TK_TABLE
},
{
TEMP_W
,
TK_TEMP
},
{
TEMPORARY_W
,
TK_TEMP
},
{
TEMPORARY_W
,
TK_TEMPORARY
},
{
THEN_W
,
TK_THEN
},
{
TRANSACTION_W
,
TK_TRANSACTION
},
{
TRIGGER_W
,
TK_TRIGGER
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment