This repository has been archived by the owner on Aug 2, 2022. It is now read-only.
ODBC: Fix for data loading failure in Power BI Desktop #627
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -100,7 +100,8 @@ const int delay_offset_3_1 = 0; | |
| const int delay_offset_3_2 = 180; | ||
| const SQLSMALLINT single_col_name_length = 6; | ||
| const SQLSMALLINT single_col_data_type = SQL_WVARCHAR; | ||
| const SQLULEN single_col_column_size_25 = 25; | ||
| const SQLULEN single_col_column_size_15 = 15; | ||
| const SQLSMALLINT single_col_decimal_digit = 0; | ||
| const SQLSMALLINT single_col_nullable = 2; | ||
| const std::wstring single_row = L"1"; | ||
|
|
@@ -936,7 +937,9 @@ TEST_F(TestSQLDescribeCol, SingleColumnMetadata) { | |
| EXPECT_EQ(single_col, m_column_name); | ||
| EXPECT_EQ(single_col_name_length, m_column_name_length); | ||
| EXPECT_EQ(single_col_data_type, m_data_type); | ||
| // Value changes according to pagination setup on server | ||
|
There was a problem hiding this comment. Not sure why. Created an issue #628 to investigate this further since I got one another value as 23 for server Will revert changes in this PR and handle this separately as it's not a blocker for fixing the data loading issue in Power BI. |
||
| EXPECT_TRUE((single_col_column_size_25 == m_column_size) | ||
| || (single_col_column_size_15 == m_column_size)); | ||
| EXPECT_EQ(single_col_decimal_digit, m_decimal_digits); | ||
| EXPECT_EQ(single_col_nullable, m_nullable); | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -83,6 +83,22 @@ const std::unordered_map< int, std::vector< int > > sql_es_type_map = { | |
| {ES_TYPE_KEYWORD, ES_TYPE_TEXT, ES_TYPE_NESTED, ES_TYPE_OBJECT}}, | ||
| {SQL_TYPE_TIMESTAMP, {ES_TYPE_DATETIME}}}; | ||
|
|
||
| const std::unordered_map< std::string, int > data_name_data_type_map = { | ||
| {ES_TYPE_NAME_BOOLEAN, SQL_BIT}, | ||
| {ES_TYPE_NAME_BYTE, SQL_TINYINT}, | ||
| {ES_TYPE_NAME_SHORT, SQL_SMALLINT}, | ||
| {ES_TYPE_NAME_INTEGER, SQL_INTEGER}, | ||
| {ES_TYPE_NAME_LONG, SQL_BIGINT}, | ||
| {ES_TYPE_NAME_HALF_FLOAT, SQL_REAL}, | ||
| {ES_TYPE_NAME_FLOAT, SQL_REAL}, | ||
| {ES_TYPE_NAME_DOUBLE, SQL_DOUBLE}, | ||
| {ES_TYPE_NAME_SCALED_FLOAT, SQL_DOUBLE}, | ||
| {ES_TYPE_NAME_KEYWORD, SQL_WVARCHAR}, | ||
| {ES_TYPE_NAME_TEXT, SQL_WVARCHAR}, | ||
| {ES_TYPE_NAME_DATE, ES_TYPE_TIMESTAMP}, | ||
| {ES_TYPE_NAME_OBJECT, SQL_WVARCHAR}, | ||
| {ES_TYPE_NAME_NESTED, SQL_WVARCHAR}}; | ||
|
|
||
| // Boilerplate code for easy column bind handling | ||
| class BindTemplate { | ||
| public: | ||
|
|
@@ -476,8 +492,28 @@ void SetTableTuples(QResultClass *res, const TableResultSet res_type, | |
| // information for its Data Preview window. | ||
| std::string catalog(""); | ||
| bind_tbl[TABLES_CATALOG_NAME]->UpdateData((void *)catalog.c_str(), 0); | ||
|
|
||
| for (size_t i = 0; i < binds.size(); i++) { | ||
| // Add tuples for SQLColumns | ||
| if (binds.size() > COLUMNS_SQL_DATA_TYPE) { | ||
|
There was a problem hiding this comment. Should we just report the extra columns regardless? There was a problem hiding this comment. The same method is used while adding tuples for SQLTables as well. SQLTables has only 5 columns whereas SQLColumns has 18. There was a problem hiding this comment. Almost wondering if it would be worth it to split some of this logic up, now that we're handling special cases for SQLTables & SQLColumns There was a problem hiding this comment. Created issue #630 to revisit the logic of assigning data for SQLTables & SQLColumns |
||
| // Add data type for data loading issue in Power BI Desktop | ||
| auto data_type = data_name_data_type_map | ||
| .find(bind_tbl[COLUMNS_TYPE_NAME]->AsString())->second; | ||
| if (i == COLUMNS_DATA_TYPE) { | ||
| set_tuplefield_int2(&tuple[COLUMNS_DATA_TYPE], | ||
| static_cast< short >(data_type)); | ||
| } else if (i == COLUMNS_SQL_DATA_TYPE) { | ||
| set_tuplefield_int2(&tuple[COLUMNS_SQL_DATA_TYPE], | ||
| static_cast< short >(data_type)); | ||
| } else { | ||
| binds[i]->AssignData(&tuple[i]); | ||
| } | ||
| } | ||
| // Add tuples for SQLTables | ||
| else { | ||
| binds[i]->AssignData(&tuple[i]); | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| // General case | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we use SQL type contstants here instead? (eg.
SQLWVARCHAR)There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
added