From b84e78bf53b0d8d205f1480e7a1feb1d77ee9a1d Mon Sep 17 00:00:00 2001 From: Michael Meskes Date: Fri, 18 Aug 2006 16:00:06 +0000 Subject: [PATCH] Applied the connect patch from HEAD. --- src/interfaces/ecpg/preproc/preproc.y | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/interfaces/ecpg/preproc/preproc.y b/src/interfaces/ecpg/preproc/preproc.y index 320249e15d..5d23232cec 100644 --- a/src/interfaces/ecpg/preproc/preproc.y +++ b/src/interfaces/ecpg/preproc/preproc.y @@ -4495,7 +4495,11 @@ connection_target: database_name opt_server opt_port if (strlen($2) > 0 && *($2) != '@') mmerror(PARSE_ERROR, ET_ERROR, "Expected '@', found '%s'", $2); - $$ = make3_str(make_str("\""), make3_str($1, $2, $3), make_str("\"")); + /* C strings need to be handled differently */ + if ($1[0] == '\"') + $$ = $1; + else + $$ = make3_str(make_str("\""), make3_str($1, $2, $3), make_str("\"")); } | db_prefix ':' server opt_port '/' database_name opt_options { @@ -4513,13 +4517,6 @@ connection_target: database_name opt_server opt_port $$ = make3_str(make3_str(make_str("\""), $1, make_str(":")), $3, make3_str(make3_str($4, make_str("/"), $6), $7, make_str("\""))); } - | Sconst - { - if ($1[0] == '\"') - $$ = $1; - else - $$ = make3_str(make_str("\""), $1, make_str("\"")); - } | char_variable { $$ = $1; -- 2.39.5