Add an alias DX of *Database* keyword for connection strings to aviod the use of...

diff --git a/dlg_specific.c b/dlg_specific.c
index bbff91f0af6734440a0c66250a7721c04346e620..8c5d895e05089989b72a1c1111adfacede711f71 100644 (file)
--- a/dlg_specific.c
+++ b/dlg_specific.c
@@ -292,6 +292,8 @@ makeConnectString(char *connect_string, const ConnInfo *ci, UWORD len)
    BOOL        abbrev = (len < 1024) || 0 < ci->force_abbrev_connstr;
    UInt4       flag;
 
+mylog("%s row_versioning=%s\n", __FUNCTION__, ci->row_versioning);
+
 MYLOG(DETAIL_LOG_LEVEL, "force_abbrev=%d abbrev=%d\n", ci->force_abbrev_connstr, abbrev);
    encode(ci->password, encoded_item, sizeof(encoded_item));
    /* fundamental info */
@@ -587,7 +589,7 @@ copyConnAttributes(ConnInfo *ci, const char *attribute, const char *value)
        STRCPY_FIXED(ci->drivername, value);
    else if (stricmp(attribute, INI_KDESC) == 0)
        STRCPY_FIXED(ci->desc, value);
-   else if (stricmp(attribute, INI_DATABASE) == 0)
+   else if (stricmp(attribute, INI_DATABASE) == 0 || stricmp(attribute, ABBR_DATABASE) == 0)
        STRCPY_FIXED(ci->database, value);
    else if (stricmp(attribute, INI_SERVER) == 0 || stricmp(attribute, SPEC_SERVER) == 0)
        STRCPY_FIXED(ci->server, value);
@@ -1184,7 +1186,7 @@ writeDSNinfo(const ConnInfo *ci)
                                 ODBC_INI);
 
    SQLWritePrivateProfileString(DSN,
-                                INI_DATABASE,
+                                ABBR_DATABASE,
                                 ci->database,
                                 ODBC_INI);
 

diff --git a/dlg_specific.h b/dlg_specific.h
index 993b89fa20b91da532dcab7bb3c43e704c2f2a1e..9f779d944d0406c56c3ca0a4a85fc119c088ae0d 100644 (file)
--- a/dlg_specific.h
+++ b/dlg_specific.h
@@ -51,6 +51,7 @@ extern "C" {
 #define INI_PORT           "Port"  /* Port on which the
                         * Postmaster is listening */
 #define INI_DATABASE           "Database"  /* Database Name */
+#define ABBR_DATABASE          "DX"    /* Database Name */
 #define INI_UID                "UID"       /* Default User Name */
 #define INI_USERNAME           "Username"  /* Default User Name */
 #define INI_PASSWORD           "Password"  /* Default Password */

diff --git a/info.c b/info.c
index e5ff2b598a1d11e8b0ae1a3d8b38a1b9253e7ce4..84b0f2ad39d2c6a8c024f51f0da3c8438e54cdf9 100644 (file)
--- a/info.c
+++ b/info.c
@@ -2275,7 +2275,7 @@ PGAPI_Columns(HSTMT hstmt,
    BOOL    setIdentity = FALSE;
    int table_info = 0;
 
-   MYLOG(0, "entering...stmt=%p scnm=%p len=%d\n", stmt, szTableOwner, cbTableOwner);
+   MYLOG(0, "entering...stmt=%p scnm=%p len=%d columnOpt=%x\n", stmt, szTableOwner, cbTableOwner, flag);
 
    if (result = SC_initialize_and_recycle(stmt), SQL_SUCCESS != result)
        return result;