Merge pull request #51 from hannes/fixtypeinfoconflict

rename TypeInfo to OdbcTypeInfo because a type with the same name app…
duckdb · Jan 13, 2025 · f5f2d79 · f5f2d79
2 parents 9f4d1bd + e5beea0
commit f5f2d79
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/include/api_info.hpp b/include/api_info.hpp
@@ -14,7 +14,7 @@
 
 namespace duckdb {
 
-struct TypeInfo {
+struct OdbcTypeInfo {
 public:
 	const char *type_name;
 	const int data_type;
@@ -47,7 +47,7 @@ struct ApiInfo {
 
 	// static const std::unordered_set<SQLSMALLINT> ODBC_SUPPORTED_SQL_TYPES;
 
-	static const vector<TypeInfo> ODBC_SUPPORTED_SQL_TYPES;
+	static const vector<OdbcTypeInfo> ODBC_SUPPORTED_SQL_TYPES;
 
 	static void SetFunctionSupported(SQLUSMALLINT *flags, int function_id);
 
@@ -58,13 +58,13 @@ struct ApiInfo {
 
 	static SQLSMALLINT FindRelatedSQLType(duckdb::LogicalTypeId type_id);
 
-	static void FindDataType(SQLSMALLINT data_type, vector<TypeInfo> &vec_types);
+	static void FindDataType(SQLSMALLINT data_type, vector<OdbcTypeInfo> &vec_types);
 
 	static SQLLEN PointerSizeOf(SQLSMALLINT sql_type);
 
-	static const vector<TypeInfo> &GetVectorTypesAddr();
+	static const vector<OdbcTypeInfo> &GetVectorTypesAddr();
 
-	static void WriteInfoTypesToQueryString(const vector<TypeInfo> &vec_types, string &query);
+	static void WriteInfoTypesToQueryString(const vector<OdbcTypeInfo> &vec_types, string &query);
 
 	static bool IsNumericDescriptorField(SQLSMALLINT field_identifier);
 

diff --git a/src/api_info.cpp b/src/api_info.cpp
@@ -6,7 +6,7 @@
 
 using duckdb::ApiInfo;
 using duckdb::idx_t;
-using duckdb::TypeInfo;
+using duckdb::OdbcTypeInfo;
 using duckdb::vector;
 using std::string;
 
@@ -32,7 +32,7 @@ SQLRETURN SQL_API SQLGetTypeInfo(SQLHSTMT statement_handle, SQLSMALLINT data_typ
 		auto vec_types = ApiInfo::GetVectorTypesAddr();
 		ApiInfo::WriteInfoTypesToQueryString(vec_types, query);
 	} else {
-		vector<TypeInfo> vec_types;
+		vector<OdbcTypeInfo> vec_types;
 		ApiInfo::FindDataType(data_type, vec_types);
 		ApiInfo::WriteInfoTypesToQueryString(vec_types, query);
 	}
@@ -110,7 +110,7 @@ const std::unordered_set<SQLUSMALLINT> ApiInfo::ODBC3_EXTRA_SUPPORTED_FUNCTIONS
  * 18. NUM_PREC_RADIX
  * 19. INTERVAL_PRECISION
  */
-const vector<duckdb::TypeInfo> ApiInfo::ODBC_SUPPORTED_SQL_TYPES = {
+const vector<duckdb::OdbcTypeInfo> ApiInfo::ODBC_SUPPORTED_SQL_TYPES = {
 // |          1               |               2              |  3|      4 |      5 |          6         |      7    |     8     |      9       |      10   |   11    |    12    |      13    |  14|  15|      16       |            17          | 18| 19|
 {                     "'CHAR'",                      SQL_CHAR,  1,  "''''", "''''",          "'length'", SQL_NULLABLE,  SQL_TRUE, SQL_SEARCHABLE,        -1, SQL_FALSE, SQL_FALSE,      "NULL", -1, -1,      SQL_CHAR,                        -1, -1, -1},
 {                  "'BOOLEAN'",                       SQL_BIT,  1,  "NULL", "NULL",              "NULL", SQL_NULLABLE, SQL_FALSE, SQL_PRED_BASIC,  SQL_TRUE,  SQL_TRUE, SQL_FALSE, "'boolean'", -1, -1,       SQL_BIT,                        -1, -1, -1},
@@ -144,7 +144,7 @@ const vector<duckdb::TypeInfo> ApiInfo::ODBC_SUPPORTED_SQL_TYPES = {
 };
 // clang-format on
 
-void ApiInfo::FindDataType(SQLSMALLINT data_type, vector<TypeInfo> &vec_types) {
+void ApiInfo::FindDataType(SQLSMALLINT data_type, vector<OdbcTypeInfo> &vec_types) {
 	duckdb::idx_t size_types = ODBC_SUPPORTED_SQL_TYPES.size();
 	for (duckdb::idx_t i = 0; i < size_types; ++i) {
 		if (ODBC_SUPPORTED_SQL_TYPES[i].data_type == data_type) {
@@ -158,7 +158,7 @@ void ApiInfo::FindDataType(SQLSMALLINT data_type, vector<TypeInfo> &vec_types) {
 	}
 }
 
-void ApiInfo::WriteInfoTypesToQueryString(const vector<TypeInfo> &vec_types, string &query) {
+void ApiInfo::WriteInfoTypesToQueryString(const vector<OdbcTypeInfo> &vec_types, string &query) {
 	for (duckdb::idx_t i = 0; i < vec_types.size(); i++) {
 		auto info_type = vec_types[i];
 		query += "(";
@@ -328,7 +328,7 @@ SQLLEN ApiInfo::PointerSizeOf(SQLSMALLINT sql_type) {
 	}
 }
 
-const vector<TypeInfo> &ApiInfo::GetVectorTypesAddr() {
+const vector<OdbcTypeInfo> &ApiInfo::GetVectorTypesAddr() {
 	return ApiInfo::ODBC_SUPPORTED_SQL_TYPES;
 }
 

diff --git a/src/descriptor.cpp b/src/descriptor.cpp
@@ -819,13 +819,13 @@ SQLRETURN DescRecord::SetSqlDataType(SQLSMALLINT type) {
 }
 
 SQLRETURN DescRecord::SetSqlDescType(SQLSMALLINT type) {
-	vector<duckdb::TypeInfo> vec_typeinfo;
+	vector<duckdb::OdbcTypeInfo> vec_typeinfo;
 	ApiInfo::FindDataType(type, vec_typeinfo);
 	if (vec_typeinfo.empty()) {
 		return SQL_ERROR; // handled
 	}
 	auto type_info = vec_typeinfo.front();
-	// for consistency check set all other fields according to the first returned TypeInfo
+	// for consistency check set all other fields according to the first returned OdbcTypeInfo
 	SetSqlDataType(type_info.sql_data_type);
 
 	sql_desc_datetime_interval_code = type_info.sql_datetime_sub;