Remove connSettings option and/or pqopt option from the OutConnectionString parameter...

diff --git a/dlg_specific.c b/dlg_specific.c
index 2eff4025898298488fb31411ecf5cbbba33559de..bbff91f0af6734440a0c66250a7721c04346e620 100644 (file)
--- a/dlg_specific.c
+++ b/dlg_specific.c
@@ -220,16 +220,16 @@ makeKeepaliveConnectString(char *target, int buflen, const ConnInfo *ci, BOOL ab
 #define OPENING_BRACKET '{'
 #define CLOSING_BRACKET '}'
 static const char *
-makeBracketConnectString(char **target, pgNAME item, const char *optname)
+makeBracketConnectString(BOOL in_str, char **target, pgNAME item, const char *optname)
 {
    const char  *istr, *iptr;
    char    *buf, *optr;
    int len;
 
-   istr = SAFE_NAME(item);
-   if (!istr[0])
+   if (!in_str)
        return NULL_STRING;
 
+   istr = SAFE_NAME(item);
    for (iptr = istr, len = 0; *iptr; iptr++)
    {
        if (CLOSING_BRACKET == *iptr)
@@ -362,7 +362,7 @@ MYLOG(DETAIL_LOG_LEVEL, "hlen=" FORMAT_SSIZE_T "\n", hlen);
            ,ci->show_oid_column
            ,ci->row_versioning
            ,ci->show_system_tables
-           ,makeBracketConnectString(&connsetStr, ci->conn_settings, INI_CONNSETTINGS)
+           ,makeBracketConnectString(ci->conn_settings_in_str, &connsetStr, ci->conn_settings, INI_CONNSETTINGS)
            ,ci->drivers.fetch_max
            ,ci->drivers.unknown_sizes
            ,ci->drivers.max_varchar_size
@@ -382,7 +382,7 @@ MYLOG(DETAIL_LOG_LEVEL, "hlen=" FORMAT_SSIZE_T "\n", hlen);
            ,ci->bytea_as_longvarbinary
            ,ci->use_server_side_prepare
            ,ci->lower_case_identifier
-           ,makeBracketConnectString(&pqoptStr, ci->pqopt, INI_PQOPT)
+           ,makeBracketConnectString(ci->pqopt_in_str, &pqoptStr, ci->pqopt, INI_PQOPT)
            ,makeKeepaliveConnectString(keepaliveStr, sizeof(keepaliveStr), ci, FALSE)
 #ifdef _HANDLE_ENLIST_IN_DTC_
            ,ci->xa_opt
@@ -463,13 +463,13 @@ MYLOG(DETAIL_LOG_LEVEL, "hlen=" FORMAT_SSIZE_T "\n", hlen);
                "%s"
 #endif /* _HANDLE_ENLIST_IN_DTC_ */
                INI_ABBREVIATE "=%02x%x",
-               makeBracketConnectString(&connsetStr, ci->conn_settings, ABBR_CONNSETTINGS),
+               makeBracketConnectString(ci->conn_settings_in_str, &connsetStr, ci->conn_settings, ABBR_CONNSETTINGS),
                ci->drivers.fetch_max,
                ci->drivers.max_varchar_size,
                ci->drivers.max_longvarchar_size,
                ci->int8_as,
                ci->drivers.extra_systable_prefixes,
-               makeBracketConnectString(&pqoptStr, ci->pqopt, ABBR_PQOPT),
+               makeBracketConnectString(ci->pqopt_in_str, &pqoptStr, ci->pqopt, ABBR_PQOPT),
                makeKeepaliveConnectString(keepaliveStr, sizeof(keepaliveStr), ci, TRUE),
 #ifdef _HANDLE_ENLIST_IN_DTC_
                makeXaOptConnectString(xaOptStr, sizeof(xaOptStr), ci, TRUE),
@@ -640,10 +640,12 @@ copyConnAttributes(ConnInfo *ci, const char *attribute, const char *value)
    else if (stricmp(attribute, INI_CONNSETTINGS) == 0 || stricmp(attribute, ABBR_CONNSETTINGS) == 0)
    {
        /* We can use the conn_settings directly when they are enclosed with braces */
+       ci->conn_settings_in_str = TRUE;
        ci->conn_settings = decode_or_remove_braces(value);
    }
    else if (stricmp(attribute, INI_PQOPT) == 0 || stricmp(attribute, ABBR_PQOPT) == 0)
    {
+       ci->pqopt_in_str = TRUE;
        ci->pqopt = decode_or_remove_braces(value);
    }
    else if (stricmp(attribute, INI_UPDATABLECURSORS) == 0 || stricmp(attribute, ABBR_UPDATABLECURSORS) == 0)

diff --git a/psqlodbc.h b/psqlodbc.h
index e08bf44a3eb0b3d4a13366d1ba7f2d5c769648e4..fa9c1c4d860c5c924a5313051fb936e8a808ff06 100644 (file)
--- a/psqlodbc.h
+++ b/psqlodbc.h
@@ -616,6 +616,8 @@ typedef struct
    char        translation_dll[MEDIUM_REGISTRY_LEN];
    char        translation_option[SMALL_REGISTRY_LEN];
    char        password_required;
+   char        conn_settings_in_str;
+   char        pqopt_in_str;
    pgNAME      conn_settings;
    pgNAME      pqopt;
    signed char allow_keyset;