database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-11-03 09:13:20 +03:00
Code Activity

Simplified parsing of connect rule.

Browse Source
This commit is contained in:
Michael Meskes
2000-10-17 06:15:29 +00:00
parent 7e3a15bd5f
commit 0a97c4a047
3 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/interfaces/ecpg/ChangeLog
View File

@@ -969,5 +969,9 @@ Thu Oct 12 20:13:00 CEST 2000
Mon Oct 16 21:33:17 CEST 2000 Mon Oct 16 21:33:17 CEST 2000
- Fixed handling of variables in connect rule. - Fixed handling of variables in connect rule.
Tue Oct 17 08:09:16 CEST 2000
- Simplified parsing ofr connect rule.
- Set ecpg version to 2.8.0. - Set ecpg version to 2.8.0.
- Set library version to 3.2.0. - Set library version to 3.2.0.

9
src/interfaces/ecpg/preproc/preproc.y
View File

@@ -465,12 +465,7 @@ stmt: AlterSchemaStmt { output_statement($1, 0, NULL, connection); }
if (connection) if (connection)
mmerror(ET_ERROR, "no at option for connect statement.\n"); mmerror(ET_ERROR, "no at option for connect statement.\n");
fputs("{ ECPGconnect(__LINE__,", yyout); fprintf(yyout, "{ ECPGconnect(__LINE__, %s, %d); ", $1, autocommit);
if ($1[1] == '?')
fprintf(yyout, "%s, %s, %d);", argsinsert->variable->name, $1 + sizeof("\"?\","), autocommit);
else
fprintf(yyout, "%s, %d); ", $1, autocommit);
reset_variables(); reset_variables();
@@ -3975,6 +3970,8 @@ connection_target: database_name opt_server opt_port
{ {
if ($1[0] == '\"') if ($1[0] == '\"')
$$ = $1; $$ = $1;
else if (strcmp($1, "?") == 0)
$$ = mm_strdup(argsinsert->variable->name);
else else
$$ = make3_str(make_str("\""), $1, make_str("\"")); $$ = make3_str(make_str("\""), $1, make_str("\""));
} }

3
src/interfaces/ecpg/test/test_init.pgc
View File

@@ -34,8 +34,11 @@ int j=1?1:2;
/*int e=y->member; /* compile error */ /*int e=y->member; /* compile error */
/*int c=10>>2; /* compile error */ /*int c=10>>2; /* compile error */
/*bool h=2||1; /* compile error */ /*bool h=2||1; /* compile error */
long long iax;
exec sql end declare section; exec sql end declare section;
iax = 40000000000LL;
/* not working */ /* not working */
int f=fa(); int f=fa();