Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
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-winehq
Commits
d31f1296
Commit
d31f1296
authored
May 19, 2005
by
Mike McCormack
Committed by
Alexandre Julliard
May 19, 2005
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Only tables can be backquoted, strings must be single quoted.
parent
88adb53b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
15 deletions
+10
-15
package.c
dlls/msi/package.c
+1
-1
sql.y
dlls/msi/sql.y
+5
-9
db.c
dlls/msi/tests/db.c
+0
-4
tokenize.c
dlls/msi/tokenize.c
+4
-1
No files found.
dlls/msi/package.c
View file @
d31f1296
...
@@ -749,7 +749,7 @@ static UINT MSI_GetPropertyRow(MSIPACKAGE *package, LPCWSTR szName, MSIRECORD **
...
@@ -749,7 +749,7 @@ static UINT MSI_GetPropertyRow(MSIPACKAGE *package, LPCWSTR szName, MSIRECORD **
static
const
WCHAR
select
[]
=
static
const
WCHAR
select
[]
=
{
's'
,
'e'
,
'l'
,
'e'
,
'c'
,
't'
,
' '
,
'V'
,
'a'
,
'l'
,
'u'
,
'e'
,
' '
,
'f'
,
'r'
,
'o'
,
'm'
,
' '
{
's'
,
'e'
,
'l'
,
'e'
,
'c'
,
't'
,
' '
,
'V'
,
'a'
,
'l'
,
'u'
,
'e'
,
' '
,
'f'
,
'r'
,
'o'
,
'm'
,
' '
,
'_'
,
'P'
,
'r'
,
'o'
,
'p'
,
'e'
,
'r'
,
't'
,
'y'
,
' '
,
'w'
,
'h'
,
'e'
,
'r'
,
'e'
,
' '
,
'_'
,
'P'
,
'r'
,
'o'
,
'p'
,
'e'
,
'r'
,
't'
,
'y'
,
' '
,
'w'
,
'h'
,
'e'
,
'r'
,
'e'
,
' '
,
'_'
,
'P'
,
'r'
,
'o'
,
'p'
,
'e'
,
'r'
,
't'
,
'y'
,
'='
,
'
`'
,
'%'
,
's'
,
'`
'
,
0
};
,
'_'
,
'P'
,
'r'
,
'o'
,
'p'
,
'e'
,
'r'
,
't'
,
'y'
,
'='
,
'
\''
,
'%'
,
's'
,
'\'
'
,
0
};
LPWSTR
query
;
LPWSTR
query
;
if
(
!
szName
)
if
(
!
szName
)
...
...
dlls/msi/sql.y
View file @
d31f1296
...
@@ -127,7 +127,7 @@ static struct expr * EXPR_wildcard();
...
@@ -127,7 +127,7 @@ static struct expr * EXPR_wildcard();
%nonassoc END_OF_FILE ILLEGAL SPACE UNCLOSED_STRING COMMENT FUNCTION
%nonassoc END_OF_FILE ILLEGAL SPACE UNCLOSED_STRING COMMENT FUNCTION
COLUMN AGG_FUNCTION.
COLUMN AGG_FUNCTION.
%type <string> column table
string_or_
id
%type <string> column table id
%type <column_list> selcollist
%type <column_list> selcollist
%type <query> from unorderedsel oneselect onequery onecreate oneinsert
%type <query> from unorderedsel oneselect onequery onecreate oneinsert
%type <query> oneupdate onedelete
%type <query> oneupdate onedelete
...
@@ -583,32 +583,28 @@ column_val:
...
@@ -583,32 +583,28 @@ column_val:
;
;
column:
column:
table TK_DOT
string_or_
id
table TK_DOT id
{
{
$$ = $3; /* FIXME */
$$ = $3; /* FIXME */
}
}
|
string_or_
id
| id
{
{
$$ = $1;
$$ = $1;
}
}
;
;
table:
table:
string_or_
id
id
{
{
$$ = $1;
$$ = $1;
}
}
;
;
string_or_
id:
id:
TK_ID
TK_ID
{
{
$$ = SQL_getstring( &$1 );
$$ = SQL_getstring( &$1 );
}
}
| TK_STRING
{
$$ = SQL_getstring( &$1 );
}
;
;
%%
%%
...
...
dlls/msi/tests/db.c
View file @
d31f1296
...
@@ -359,10 +359,8 @@ void test_msibadqueries()
...
@@ -359,10 +359,8 @@ void test_msibadqueries()
r
=
try_query
(
hdb
,
"CREATE TABLE `a` (`b` CHAR(72) NOT NULL PRIMARY KEY)"
);
r
=
try_query
(
hdb
,
"CREATE TABLE `a` (`b` CHAR(72) NOT NULL PRIMARY KEY)"
);
ok
(
r
==
ERROR_BAD_QUERY_SYNTAX
,
"invalid query 2i return code
\n
"
);
ok
(
r
==
ERROR_BAD_QUERY_SYNTAX
,
"invalid query 2i return code
\n
"
);
todo_wine
{
r
=
try_query
(
hdb
,
"CREATE TABLE `a` (`b` CHAR(72) NOT NULL PRIMARY KEY 'b')"
);
r
=
try_query
(
hdb
,
"CREATE TABLE `a` (`b` CHAR(72) NOT NULL PRIMARY KEY 'b')"
);
ok
(
r
==
ERROR_BAD_QUERY_SYNTAX
,
"invalid query 2j return code
\n
"
);
ok
(
r
==
ERROR_BAD_QUERY_SYNTAX
,
"invalid query 2j return code
\n
"
);
}
r
=
try_query
(
hdb
,
"CREATE TABLE `a` (`b` CHAR(72) NOT NULL PRIMARY KEY `b')"
);
r
=
try_query
(
hdb
,
"CREATE TABLE `a` (`b` CHAR(72) NOT NULL PRIMARY KEY `b')"
);
ok
(
r
==
ERROR_BAD_QUERY_SYNTAX
,
"invalid query 2k return code
\n
"
);
ok
(
r
==
ERROR_BAD_QUERY_SYNTAX
,
"invalid query 2k return code
\n
"
);
...
@@ -385,10 +383,8 @@ void test_msibadqueries()
...
@@ -385,10 +383,8 @@ void test_msibadqueries()
r
=
try_query
(
hdb
,
"CREATE TABLE `a` (`` CHAR(72) NOT NULL PRIMARY KEY `b`)"
);
r
=
try_query
(
hdb
,
"CREATE TABLE `a` (`` CHAR(72) NOT NULL PRIMARY KEY `b`)"
);
ok
(
r
==
ERROR_BAD_QUERY_SYNTAX
,
"invalid query 2p return code
\n
"
);
ok
(
r
==
ERROR_BAD_QUERY_SYNTAX
,
"invalid query 2p return code
\n
"
);
todo_wine
{
r
=
try_query
(
hdb
,
"CREATE TABLE `a` (`b` CHAR(72) NOT NULL PRIMARY KEY `b`)"
);
r
=
try_query
(
hdb
,
"CREATE TABLE `a` (`b` CHAR(72) NOT NULL PRIMARY KEY `b`)"
);
ok
(
r
==
ERROR_SUCCESS
,
"valid query 2z failed
\n
"
);
ok
(
r
==
ERROR_SUCCESS
,
"valid query 2z failed
\n
"
);
}
r
=
try_query
(
hdb
,
"CREATE TABLE `a` (`b` CHAR(72) NOT NULL PRIMARY KEY `b`)"
);
r
=
try_query
(
hdb
,
"CREATE TABLE `a` (`b` CHAR(72) NOT NULL PRIMARY KEY `b`)"
);
ok
(
r
==
ERROR_BAD_QUERY_SYNTAX
,
"created same table again
\n
"
);
ok
(
r
==
ERROR_BAD_QUERY_SYNTAX
,
"created same table again
\n
"
);
...
...
dlls/msi/tokenize.c
View file @
d31f1296
...
@@ -346,7 +346,10 @@ int sqliteGetToken(const WCHAR *z, int *tokenType){
...
@@ -346,7 +346,10 @@ int sqliteGetToken(const WCHAR *z, int *tokenType){
}
}
}
}
if
(
z
[
i
]
)
i
++
;
if
(
z
[
i
]
)
i
++
;
*
tokenType
=
TK_STRING
;
if
(
delim
==
'`'
)
*
tokenType
=
TK_ID
;
else
*
tokenType
=
TK_STRING
;
return
i
;
return
i
;
}
}
case
'.'
:
{
case
'.'
:
{
...
...
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