Skip to content

Commit

Permalink
adjust oridinal position for SQLColumns (#90)
Browse files Browse the repository at this point in the history
  • Loading branch information
@yanw-bq
yanw-bq authored Jun 29, 2021
1 parent b23ad42 commit 8efe672
Showing 1 changed file with 36 additions and 36 deletions.
72 changes: 36 additions & 36 deletions src/IntegrationTests/ITODBCCatalog/test_odbc_catalog.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -694,7 +694,7 @@ TEST_F(TestSQLColumns, EXACT_MATCH_ONE_COLUMN) {
{"ODBCTest", "", "IoT", "time", std::to_string(SQL_TYPE_TIMESTAMP),
"timestamp", "29", std::to_string(sizeof(TIMESTAMP_STRUCT)), "9", "",
std::to_string(SQL_NULLABLE), "", "", std::to_string(SQL_DATETIME),
std::to_string(SQL_CODE_TIMESTAMP), "", "36", "YES"}};
std::to_string(SQL_CODE_TIMESTAMP), "", "4", "YES"}};
CheckRows(expected, result);
}

Expand Down Expand Up @@ -723,30 +723,30 @@ TEST_F(TestSQLColumns, EXACT_MATCH_ALL_COLUMNS) {
result.push_back(row);
}
std::vector< std::vector< std::string > > expected{
{"ODBCTest", "", "DevOps", "hostname", std::to_string(SQL_VARCHAR),
"varchar", std::to_string(INT_MAX), "256", "", "",
std::to_string(SQL_NULLABLE), "", "", std::to_string(SQL_VARCHAR), "",
std::to_string(INT_MAX), "1", "YES"},
{"ODBCTest", "", "DevOps", "az", std::to_string(SQL_VARCHAR), "varchar",
std::to_string(INT_MAX), "256", "", "", std::to_string(SQL_NULLABLE),
"", "", std::to_string(SQL_VARCHAR), "", std::to_string(INT_MAX), "2",
"YES"},
{"ODBCTest", "", "DevOps", "region", std::to_string(SQL_VARCHAR),
"varchar", std::to_string(INT_MAX), "256", "", "",
std::to_string(SQL_NULLABLE), "", "", std::to_string(SQL_VARCHAR), "",
std::to_string(INT_MAX), "3", "YES"},
{"ODBCTest", "", "DevOps", "measure_value::double",
std::to_string(SQL_DOUBLE), "double", "15",
std::to_string(sizeof(double)), "", "10", std::to_string(SQL_NULLABLE),
"", "", std::to_string(SQL_DOUBLE), "", "", "4", "YES"},
"", "", std::to_string(SQL_DOUBLE), "", "", "1", "YES"},
{"ODBCTest", "", "DevOps", "measure_name", std::to_string(SQL_VARCHAR),
"varchar", std::to_string(INT_MAX), "256", "", "",
std::to_string(SQL_NULLABLE), "", "", std::to_string(SQL_VARCHAR), "",
std::to_string(INT_MAX), "5", "YES"},
std::to_string(INT_MAX), "2", "YES"},
{"ODBCTest", "", "DevOps", "time", std::to_string(SQL_TYPE_TIMESTAMP),
"timestamp", "29", std::to_string(sizeof(TIMESTAMP_STRUCT)), "9", "",
std::to_string(SQL_NULLABLE), "", "", std::to_string(SQL_DATETIME),
std::to_string(SQL_CODE_TIMESTAMP), "", "6", "YES"}};
std::to_string(SQL_CODE_TIMESTAMP), "", "3", "YES"},
{"ODBCTest", "", "DevOps", "hostname", std::to_string(SQL_VARCHAR),
"varchar", std::to_string(INT_MAX), "256", "", "",
std::to_string(SQL_NULLABLE), "", "", std::to_string(SQL_VARCHAR), "",
std::to_string(INT_MAX), "4", "YES"},
{"ODBCTest", "", "DevOps", "az", std::to_string(SQL_VARCHAR), "varchar",
std::to_string(INT_MAX), "256", "", "", std::to_string(SQL_NULLABLE),
"", "", std::to_string(SQL_VARCHAR), "", std::to_string(INT_MAX), "5",
"YES"},
{"ODBCTest", "", "DevOps", "region", std::to_string(SQL_VARCHAR),
"varchar", std::to_string(INT_MAX), "256", "", "",
std::to_string(SQL_NULLABLE), "", "", std::to_string(SQL_VARCHAR), "",
std::to_string(INT_MAX), "6", "YES"}};
CheckRows(expected, result);
}

Expand Down Expand Up @@ -775,30 +775,30 @@ TEST_F(TestSQLColumns, SEARCH_PATTERN_ALL_COLUMNS) {
result.push_back(row);
}
std::vector< std::vector< std::string > > expected{
{"ODBCTest", "", "DevOps", "hostname", std::to_string(SQL_VARCHAR),
"varchar", std::to_string(INT_MAX), "256", "", "",
std::to_string(SQL_NULLABLE), "", "", std::to_string(SQL_VARCHAR), "",
std::to_string(INT_MAX), "1", "YES"},
{"ODBCTest", "", "DevOps", "az", std::to_string(SQL_VARCHAR), "varchar",
std::to_string(INT_MAX), "256", "", "", std::to_string(SQL_NULLABLE),
"", "", std::to_string(SQL_VARCHAR), "", std::to_string(INT_MAX), "2",
"YES"},
{"ODBCTest", "", "DevOps", "region", std::to_string(SQL_VARCHAR),
"varchar", std::to_string(INT_MAX), "256", "", "",
std::to_string(SQL_NULLABLE), "", "", std::to_string(SQL_VARCHAR), "",
std::to_string(INT_MAX), "3", "YES"},
{"ODBCTest", "", "DevOps", "measure_value::double",
std::to_string(SQL_DOUBLE), "double", "15",
std::to_string(sizeof(double)), "", "10", std::to_string(SQL_NULLABLE),
"", "", std::to_string(SQL_DOUBLE), "", "", "4", "YES"},
"", "", std::to_string(SQL_DOUBLE), "", "", "1", "YES"},
{"ODBCTest", "", "DevOps", "measure_name", std::to_string(SQL_VARCHAR),
"varchar", std::to_string(INT_MAX), "256", "", "",
std::to_string(SQL_NULLABLE), "", "", std::to_string(SQL_VARCHAR), "",
std::to_string(INT_MAX), "5", "YES"},
std::to_string(INT_MAX), "2", "YES"},
{"ODBCTest", "", "DevOps", "time", std::to_string(SQL_TYPE_TIMESTAMP),
"timestamp", "29", std::to_string(sizeof(TIMESTAMP_STRUCT)), "9", "",
std::to_string(SQL_NULLABLE), "", "", std::to_string(SQL_DATETIME),
std::to_string(SQL_CODE_TIMESTAMP), "", "6", "YES"}};
std::to_string(SQL_CODE_TIMESTAMP), "", "3", "YES"},
{"ODBCTest", "", "DevOps", "hostname", std::to_string(SQL_VARCHAR),
"varchar", std::to_string(INT_MAX), "256", "", "",
std::to_string(SQL_NULLABLE), "", "", std::to_string(SQL_VARCHAR), "",
std::to_string(INT_MAX), "4", "YES"},
{"ODBCTest", "", "DevOps", "az", std::to_string(SQL_VARCHAR), "varchar",
std::to_string(INT_MAX), "256", "", "", std::to_string(SQL_NULLABLE),
"", "", std::to_string(SQL_VARCHAR), "", std::to_string(INT_MAX), "5",
"YES"},
{"ODBCTest", "", "DevOps", "region", std::to_string(SQL_VARCHAR),
"varchar", std::to_string(INT_MAX), "256", "", "",
std::to_string(SQL_NULLABLE), "", "", std::to_string(SQL_VARCHAR), "",
std::to_string(INT_MAX), "6", "YES"}};
CheckRows(expected, result);
}

Expand Down Expand Up @@ -831,11 +831,11 @@ TEST_F(TestSQLColumns, SEARCH_PATTERN_SOME_COLUMNS) {
{"ODBCTest", "", "DevOps", "measure_value::double",
std::to_string(SQL_DOUBLE), "double", "15",
std::to_string(sizeof(double)), "", "10", std::to_string(SQL_NULLABLE),
"", "", std::to_string(SQL_DOUBLE), "", "", "4", "YES"},
"", "", std::to_string(SQL_DOUBLE), "", "", "1", "YES"},
{"ODBCTest", "", "DevOps", "measure_name", std::to_string(SQL_VARCHAR),
"varchar", std::to_string(INT_MAX), "256", "", "",
std::to_string(SQL_NULLABLE), "", "", std::to_string(SQL_VARCHAR), "",
std::to_string(INT_MAX), "5", "YES"}};
std::to_string(INT_MAX), "2", "YES"}};
CheckRows(expected, result);
}

Expand Down Expand Up @@ -867,11 +867,11 @@ TEST_F(TestSQLColumns, SEARCH_PATTERN_MULTI_TABLES_COLUMNS) {
{"ODBCTest", "", "DevOps", "time", std::to_string(SQL_TYPE_TIMESTAMP),
"timestamp", "29", std::to_string(sizeof(TIMESTAMP_STRUCT)), "9", "",
std::to_string(SQL_NULLABLE), "", "", std::to_string(SQL_DATETIME),
std::to_string(SQL_CODE_TIMESTAMP), "", "6", "YES"},
std::to_string(SQL_CODE_TIMESTAMP), "", "3", "YES"},
{"ODBCTest", "", "IoT", "time", std::to_string(SQL_TYPE_TIMESTAMP),
"timestamp", "29", std::to_string(sizeof(TIMESTAMP_STRUCT)), "9", "",
std::to_string(SQL_NULLABLE), "", "", std::to_string(SQL_DATETIME),
std::to_string(SQL_CODE_TIMESTAMP), "", "36", "YES"}};
std::to_string(SQL_CODE_TIMESTAMP), "", "4", "YES"}};
CheckRows(expected, result);
}

Expand Down Expand Up @@ -906,7 +906,7 @@ TEST_F(TestSQLColumns, META_DATA_CASE_INSENSITIVE) {
{"ODBCTest", "", "DevOps", "time", std::to_string(SQL_TYPE_TIMESTAMP),
"timestamp", "29", std::to_string(sizeof(TIMESTAMP_STRUCT)), "9", "",
std::to_string(SQL_NULLABLE), "", "", std::to_string(SQL_DATETIME),
std::to_string(SQL_CODE_TIMESTAMP), "", "6", "YES"}};
std::to_string(SQL_CODE_TIMESTAMP), "", "3", "YES"}};
CheckRows(expected, result);
}

Expand Down

0 comments on commit 8efe672

Please sign in to comment.