Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 5045004

Browse files
author
Michael Meskes
committed
Added Lee Kindness' patches.
1 parent f8bcf12 commit 5045004

File tree

2 files changed

+22
-13
lines changed

2 files changed

+22
-13
lines changed

src/interfaces/ecpg/ChangeLog

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,5 +1129,10 @@ Sun Oct 14 14:07:59 CEST 2001
11291129

11301130
- Fixed GRANT statement.
11311131
- Synced preproc.y with gram.y.
1132+
1133+
Thu Oct 18 12:57:04 CEST 2001
1134+
1135+
- Added patch by Lee Kindness <lkindness@csl.co.uk> fixing several
1136+
bugs.
11321137
- Set ecpg version to 2.9.0.
11331138
- Set library version to 3.3.0.

src/interfaces/ecpg/preproc/preproc.y

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1074,11 +1074,11 @@ OptTemp: TEMPORARY { $$ = make_str("temporary"); }
10741074
| LOCAL TEMPORARY { $$ = make_str("local temporary"); }
10751075
| LOCAL TEMP { $$ = make_str("local temp"); }
10761076
| GLOBAL TEMPORARY {
1077-
mmerror(ET_ERROR, "GLOBAL TEMPORARY TABLE is not currently supported");
1077+
mmerror(ET_NOTICE, "Currently unsupported CREATE TABLE/GLOBAL TEMPORARY will be passed to backend");
10781078
$$ = make_str("global temporary");
10791079
}
10801080
| GLOBAL TEMP {
1081-
mmerror(ET_ERROR, "GLOBAL TEMPORARY TABLE is not currently supported");
1081+
mmerror(ET_NOTICE, "Currently unsupported CREATE TABLE/GLOBAL TEMP will be passed to backend");
10821082
$$ = make_str("global temp");
10831083
}
10841084
| /*EMPTY*/ { $$ = EMPTY; }
@@ -1103,8 +1103,8 @@ columnDef: ColId Typename ColQualList opt_collate
11031103
{
11041104
if (strlen($4) > 0)
11051105
{
1106-
sprintf(errortext, "CREATE TABLE/COLLATE %s not yet implemented; clause ignored", $4);
1107-
mmerror(ET_NOTICE, errortext);
1106+
sprintf(errortext, "Currently unsupported CREATE TABLE/COLLATE %s will be passed to backend", $4);
1107+
mmerror(ET_NOTICE, errortext);
11081108
}
11091109
$$ = cat_str(4, $1, $2, $3, $4);
11101110
}
@@ -1219,7 +1219,7 @@ key_match: MATCH FULL
12191219
}
12201220
| MATCH PARTIAL
12211221
{
1222-
mmerror(ET_NOTICE, "FOREIGN KEY/MATCH PARTIAL not yet implemented");
1222+
mmerror(ET_NOTICE, "Currently unsupported FOREIGN KEY/MATCH PARTIAL will be passed to backend");
12231223
$$ = make_str("match partial");
12241224
}
12251225
| /*EMPTY*/
@@ -1614,7 +1614,7 @@ direction: FORWARD { $$ = make_str("forward"); }
16141614
| BACKWARD { $$ = make_str("backward"); }
16151615
| RELATIVE { $$ = make_str("relative"); }
16161616
| ABSOLUTE {
1617-
mmerror(ET_NOTICE, "FETCH/ABSOLUTE not supported, backend will use RELATIVE");
1617+
mmerror(ET_NOTICE, "Currently unsupported FETCH/ABSOLUTE will be passed to backend, backend will use RELATIVE");
16181618
$$ = make_str("absolute");
16191619
}
16201620
;
@@ -1769,7 +1769,11 @@ grantee_list: grantee { $$ = $1; }
17691769
| grantee_list ',' grantee { $$ = cat_str(3, $1, make_str(","), $3); }
17701770
;
17711771

1772-
opt_with_grant: WITH GRANT OPTION { $$ = make_str("with grant option"); }
1772+
opt_with_grant: WITH GRANT OPTION
1773+
{
1774+
mmerror(ET_NOTICE, "Currently unsupported GRANT/WITH GRANT OPTION will be passed to backend");
1775+
$$ = make_str("with grant option");
1776+
}
17731777
| /*EMPTY*/ { $$ = EMPTY; }
17741778
;
17751779

@@ -1919,14 +1923,14 @@ func_arg: opt_arg func_type
19191923

19201924
opt_arg: IN { $$ = make_str("in"); }
19211925
| OUT {
1922-
mmerror(ET_ERROR, "CREATE FUNCTION/OUT parameters are not supported");
1926+
mmerror(ET_NOTICE, "Currently unsupported CREATE FUNCTION/OUT will be passed to backend");
19231927

19241928
$$ = make_str("out");
19251929
}
19261930
| INOUT {
1927-
mmerror(ET_ERROR, "CREATE FUNCTION/INOUT parameters are not supported");
1931+
mmerror(ET_NOTICE, "Currently unsupported CREATE FUNCTION/INOUT will be passed to backend");
19281932

1929-
$$ = make_str("oinut");
1933+
$$ = make_str("inout");
19301934
}
19311935
;
19321936

@@ -2164,7 +2168,7 @@ opt_trans: WORK { $$ = ""; }
21642168

21652169
opt_chain: AND NO CHAIN { $$ = make_str("and no chain"); }
21662170
| AND CHAIN {
2167-
mmerror(ET_ERROR, "COMMIT/CHAIN not yet supported");
2171+
mmerror(ET_NOTICE, "Currently unsupported COMMIT/CHAIN will be passed to backend");
21682172

21692173
$$ = make_str("and chain");
21702174
}
@@ -2609,12 +2613,12 @@ OptTempTableName: TEMPORARY opt_table relation_name
26092613
}
26102614
| GLOBAL TEMPORARY opt_table relation_name
26112615
{
2612-
mmerror(ET_ERROR, "GLOBAL TEMPORARY TABLE is not currently supported");
2616+
mmerror(ET_NOTICE, "Currently unsupported CREATE TABLE/GLOBAL TEMPORARY will be passed to backend");
26132617
$$ = cat_str(3, make_str("global temporary"), $3, $4);
26142618
}
26152619
| GLOBAL TEMP opt_table relation_name
26162620
{
2617-
mmerror(ET_ERROR, "GLOBAL TEMPORARY TABLE is not currently supported");
2621+
mmerror(ET_NOTICE, "Currently unsupported CREATE TABLE/GLOBAL TEMP will be passed to backend");
26182622
$$ = cat_str(3, make_str("global temp"), $3, $4);
26192623
}
26202624
| TABLE relation_name

0 commit comments

Comments
 (0)