Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Update odbccpp dependency
  • Loading branch information
mrylov authored and nyalldawson committed May 4, 2021
1 parent fd817b7 commit 5dcfc8f
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 0 deletions.
10 changes: 10 additions & 0 deletions external/odbccpp/src/odbc/ResultSetMetaData.cpp
Expand Up @@ -29,6 +29,16 @@ string ResultSetMetaData::getTableName(unsigned short columnIndex)
return getStringColAttribute(columnIndex, SQL_DESC_TABLE_NAME);
}
//------------------------------------------------------------------------------
string ResultSetMetaData::getBaseTableName(unsigned short columnIndex)
{
return getStringColAttribute(columnIndex, SQL_DESC_BASE_TABLE_NAME);
}
//------------------------------------------------------------------------------
string ResultSetMetaData::getBaseColumnName(unsigned short columnIndex)
{
return getStringColAttribute(columnIndex, SQL_DESC_BASE_COLUMN_NAME);
}
//------------------------------------------------------------------------------
string ResultSetMetaData::getColumnLabel(unsigned short columnIndex)
{
return getStringColAttribute(columnIndex, SQL_DESC_LABEL);
Expand Down
16 changes: 16 additions & 0 deletions external/odbccpp/src/odbc/ResultSetMetaData.h
Expand Up @@ -44,6 +44,22 @@ class ODBC_EXPORT ResultSetMetaData : public ResultSetMetaDataBase
*/
std::string getTableName(unsigned short columnIndex);

/**
* Returns the name of the base table that contains the column.
*
* @param columnIndex The column index starting from 1.
* @return Returns the base table name.
*/
std::string getBaseTableName(unsigned short columnIndex);

/**
* Returns the base column name for the result set column.
*
* @param columnIndex The column index starting from 1.
* @return Returns the base column name.
*/
std::string getBaseColumnName(unsigned short columnIndex);

/**
* Returns a column's label.
*
Expand Down
12 changes: 12 additions & 0 deletions external/odbccpp/src/odbc/ResultSetMetaDataUnicode.cpp
Expand Up @@ -29,6 +29,18 @@ u16string ResultSetMetaDataUnicode::getTableName(unsigned short columnIndex)
return getStringColAttribute(columnIndex, SQL_DESC_TABLE_NAME);
}
//------------------------------------------------------------------------------
u16string ResultSetMetaDataUnicode::getBaseTableName(
unsigned short columnIndex)
{
return getStringColAttribute(columnIndex, SQL_DESC_BASE_TABLE_NAME);
}
//------------------------------------------------------------------------------
u16string ResultSetMetaDataUnicode::getBaseColumnName(
unsigned short columnIndex)
{
return getStringColAttribute(columnIndex, SQL_DESC_BASE_COLUMN_NAME);
}
//------------------------------------------------------------------------------
u16string ResultSetMetaDataUnicode::getColumnLabel(unsigned short columnIndex)
{
return getStringColAttribute(columnIndex, SQL_DESC_LABEL);
Expand Down
16 changes: 16 additions & 0 deletions external/odbccpp/src/odbc/ResultSetMetaDataUnicode.h
Expand Up @@ -44,6 +44,22 @@ class ODBC_EXPORT ResultSetMetaDataUnicode : public ResultSetMetaDataBase
*/
std::u16string getTableName(unsigned short columnIndex);

/**
* Returns the name of the base table that contains the column.
*
* @param columnIndex The column index starting from 1.
* @return Returns the base table name.
*/
std::u16string getBaseTableName(unsigned short columnIndex);

/**
* Returns the base column name for the result set column.
*
* @param columnIndex The column index starting from 1.
* @return Returns the base column name.
*/
std::u16string getBaseColumnName(unsigned short columnIndex);

/**
* Returns a column's label.
*
Expand Down

0 comments on commit 5dcfc8f

Please sign in to comment.