From 5dcfc8fb607c3668ef8164762e98f286cd0affd8 Mon Sep 17 00:00:00 2001 From: Maxim Rylov Date: Thu, 25 Mar 2021 13:53:08 +0100 Subject: [PATCH] Update odbccpp dependency --- external/odbccpp/src/odbc/ResultSetMetaData.cpp | 10 ++++++++++ external/odbccpp/src/odbc/ResultSetMetaData.h | 16 ++++++++++++++++ .../src/odbc/ResultSetMetaDataUnicode.cpp | 12 ++++++++++++ .../odbccpp/src/odbc/ResultSetMetaDataUnicode.h | 16 ++++++++++++++++ 4 files changed, 54 insertions(+) diff --git a/external/odbccpp/src/odbc/ResultSetMetaData.cpp b/external/odbccpp/src/odbc/ResultSetMetaData.cpp index 31dca4410d2..eb541c716b6 100644 --- a/external/odbccpp/src/odbc/ResultSetMetaData.cpp +++ b/external/odbccpp/src/odbc/ResultSetMetaData.cpp @@ -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); diff --git a/external/odbccpp/src/odbc/ResultSetMetaData.h b/external/odbccpp/src/odbc/ResultSetMetaData.h index 7d010eda708..7b524f353ae 100644 --- a/external/odbccpp/src/odbc/ResultSetMetaData.h +++ b/external/odbccpp/src/odbc/ResultSetMetaData.h @@ -44,6 +44,22 @@ public: */ 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. * diff --git a/external/odbccpp/src/odbc/ResultSetMetaDataUnicode.cpp b/external/odbccpp/src/odbc/ResultSetMetaDataUnicode.cpp index b4397ff6412..b160489b15d 100644 --- a/external/odbccpp/src/odbc/ResultSetMetaDataUnicode.cpp +++ b/external/odbccpp/src/odbc/ResultSetMetaDataUnicode.cpp @@ -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); diff --git a/external/odbccpp/src/odbc/ResultSetMetaDataUnicode.h b/external/odbccpp/src/odbc/ResultSetMetaDataUnicode.h index da1dbb639e2..49b1ef3bea8 100644 --- a/external/odbccpp/src/odbc/ResultSetMetaDataUnicode.h +++ b/external/odbccpp/src/odbc/ResultSetMetaDataUnicode.h @@ -44,6 +44,22 @@ public: */ 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. *