Merge pull request #124 from maiadegraaf/empty_stubs_improvements

Empty Stub Improvements

Author: maiadegraaf

duckdb_odbc.def

@@ -475,6 +475,7 @@ SQLAllocHandle
 SQLBindCol
 SQLBindParameter
 SQLBrowseConnect
+SQLBrowseConnectW
 SQLBulkOperations
 SQLCancel
 SQLCloseCursor

duckdb_odbc.exp

@@ -472,6 +472,7 @@ _SQLAllocHandle
 _SQLBindCol
 _SQLBindParameter
 _SQLBrowseConnect
+_SQLBrowseConnectW
 _SQLBulkOperations
 _SQLCancel
 _SQLCloseCursor

duckdb_odbc.map

@@ -474,6 +474,7 @@ DUCKDB_ODBC {
     SQLBindCol;
     SQLBindParameter;
     SQLBrowseConnect;
+    SQLBrowseConnectW;
     SQLBulkOperations;
     SQLCancel;
     SQLCloseCursor;

include/odbc_utils.hpp

@@ -92,6 +92,7 @@ struct OdbcUtils {
 	static SQLUINTEGER SQLPointerToSQLUInteger(SQLPOINTER value);
 	static std::string ConvertSQLCHARToString(SQLCHAR *str);
 	static LPCSTR ConvertStringToLPCSTR(const std::string &str);
+	static SQLCHAR *ConvertStringToSQLCHAR(const std::string &str);
 };
 } // namespace duckdb
 #endif

src/common/odbc_utils.cpp

@@ -252,10 +252,14 @@ std::string OdbcUtils::ConvertSQLCHARToString(SQLCHAR *str) {
 	return std::string(reinterpret_cast<char *>(str));
 }
 
-LPCSTR duckdb::OdbcUtils::ConvertStringToLPCSTR(const std::string &str) {
+LPCSTR OdbcUtils::ConvertStringToLPCSTR(const std::string &str) {
 	return reinterpret_cast<LPCSTR>(const_cast<char *>(str.c_str()));
 }
 
+SQLCHAR *OdbcUtils::ConvertStringToSQLCHAR(const std::string &str) {
+	return reinterpret_cast<SQLCHAR *>(const_cast<char *>(str.c_str()));
+}
+
 template <typename INT_TYPE>
 static void WriteStringInternal(const SQLCHAR *utf8_data, std::size_t utf8_data_len, SQLWCHAR *out_buf, SQLLEN buf_len,
                                 INT_TYPE *out_len) {

src/empty_stubs.cpp

@@ -577,97 +577,6 @@ SQLRETURN SQL_API SQLColumnsW(SQLHSTMT statement_handle, SQLWCHAR *catalog_name,
 	                       column_name_conv.utf8_len_smallint());
 }
 
-static SQLRETURN SpecialColumnsInternal(SQLHSTMT statement_handle, SQLUSMALLINT identifier_type, SQLCHAR *catalog_name,
-                                        SQLSMALLINT name_length1, SQLCHAR *schema_name, SQLSMALLINT name_length2,
-                                        SQLCHAR *table_name, SQLSMALLINT name_length3, SQLUSMALLINT scope,
-                                        SQLUSMALLINT nullable) {
-	std::string query = R"#(
-SELECT
-	CAST(0  AS SMALLINT) AS "SCOPE",
-	CAST('' AS VARCHAR ) AS "COLUMN_NAME", 
-	CAST(0  AS SMALLINT) AS "DATA_TYPE",
-	CAST('' AS VARCHAR ) AS "TYPE_NAME",
-	CAST(0  AS INT     ) AS "COLUMN_SIZE",
-	CAST(0  AS INT     ) AS "BUFFER_LENGTH",
-	CAST(0  AS SMALLINT) AS "DECIMAL_DIGITS", 
-	CAST(0  AS SMALLINT) AS "PSEUDO_COLUMN"
-WHERE 1 < 0
-)#";
-	SQLRETURN ret =
-	    duckdb::ExecDirectStmt(statement_handle, (SQLCHAR *)query.c_str(), static_cast<SQLINTEGER>(query.size()));
-	if (!SQL_SUCCEEDED(ret)) {
-		return ret;
-	}
-	return SQL_SUCCESS;
-}
-
-SQLRETURN SQL_API SQLSpecialColumns(SQLHSTMT statement_handle, SQLUSMALLINT identifier_type, SQLCHAR *catalog_name,
-                                    SQLSMALLINT name_length1, SQLCHAR *schema_name, SQLSMALLINT name_length2,
-                                    SQLCHAR *table_name, SQLSMALLINT name_length3, SQLUSMALLINT scope,
-                                    SQLUSMALLINT nullable) {
-	return SpecialColumnsInternal(statement_handle, identifier_type, catalog_name, name_length1, schema_name,
-	                              name_length2, table_name, name_length3, scope, nullable);
-}
-
-SQLRETURN SQL_API SQLSpecialColumnsW(SQLHSTMT statement_handle, SQLSMALLINT identifier_type, SQLWCHAR *catalog_name,
-                                     SQLSMALLINT name_length1, SQLWCHAR *schema_name, SQLSMALLINT name_length2,
-                                     SQLWCHAR *table_name, SQLSMALLINT name_length3, SQLSMALLINT scope,
-                                     SQLSMALLINT nullable) {
-	auto catalog_name_conv = duckdb::widechar::utf16_conv(catalog_name, name_length1);
-	auto schema_name_conv = duckdb::widechar::utf16_conv(schema_name, name_length2);
-	auto table_name_conv = duckdb::widechar::utf16_conv(table_name, name_length3);
-	return SpecialColumnsInternal(statement_handle, identifier_type, catalog_name_conv.utf8_str,
-	                              catalog_name_conv.utf8_len_smallint(), schema_name_conv.utf8_str,
-	                              schema_name_conv.utf8_len_smallint(), table_name_conv.utf8_str,
-	                              table_name_conv.utf8_len_smallint(), scope, nullable);
-}
-
-static SQLRETURN StatisticsInternal(SQLHSTMT statement_handle, SQLCHAR *catalog_name, SQLSMALLINT name_length1,
-                                    SQLCHAR *schema_name, SQLSMALLINT name_length2, SQLCHAR *table_name,
-                                    SQLSMALLINT name_length3, SQLUSMALLINT unique, SQLUSMALLINT reserved) {
-	std::string query = R"#(
-SELECT
-	CAST('' AS VARCHAR ) AS "TABLE_CAT",
-	CAST('' AS VARCHAR ) AS "TABLE_SCHEM",
-	CAST('' AS VARCHAR ) AS "TABLE_NAME",
-	CAST(0  AS SMALLINT) AS "NON_UNIQUE",
-	CAST('' AS VARCHAR ) AS "INDEX_QUALIFIER",
-	CAST('' AS VARCHAR ) AS "INDEX_NAME",
-	CAST(0  AS SMALLINT) AS "TYPE",
-	CAST(0  AS SMALLINT) AS "ORDINAL_POSITION",
-	CAST('' AS VARCHAR ) AS "COLUMN_NAME",
-	CAST('' AS CHAR(1) ) AS "ASC_OR_DESC",
-	CAST(0  AS INT     ) AS "CARDINALITY",
-	CAST(0  AS INT     ) AS "PAGES",
-	CAST('' AS VARCHAR ) AS "FILTER_CONDITION"
-WHERE 1 < 0
-)#";
-	SQLRETURN ret =
-	    duckdb::ExecDirectStmt(statement_handle, (SQLCHAR *)query.c_str(), static_cast<SQLINTEGER>(query.size()));
-	if (!SQL_SUCCEEDED(ret)) {
-		return ret;
-	}
-	return SQL_SUCCESS;
-}
-
-SQLRETURN SQL_API SQLStatistics(SQLHSTMT statement_handle, SQLCHAR *catalog_name, SQLSMALLINT name_length1,
-                                SQLCHAR *schema_name, SQLSMALLINT name_length2, SQLCHAR *table_name,
-                                SQLSMALLINT name_length3, SQLUSMALLINT unique, SQLUSMALLINT reserved) {
-	return StatisticsInternal(statement_handle, catalog_name, name_length1, schema_name, name_length2, table_name,
-	                          name_length3, unique, reserved);
-}
-
-SQLRETURN SQL_API SQLStatisticsW(SQLHSTMT statement_handle, SQLWCHAR *catalog_name, SQLSMALLINT name_length1,
-                                 SQLWCHAR *schema_name, SQLSMALLINT name_length2, SQLWCHAR *table_name,
-                                 SQLSMALLINT name_length3, SQLUSMALLINT unique, SQLUSMALLINT reserved) {
-	auto catalog_name_conv = duckdb::widechar::utf16_conv(catalog_name, name_length1);
-	auto schema_name_conv = duckdb::widechar::utf16_conv(schema_name, name_length2);
-	auto table_name_conv = duckdb::widechar::utf16_conv(table_name, name_length3);
-	return StatisticsInternal(statement_handle, catalog_name_conv.utf8_str, catalog_name_conv.utf8_len_smallint(),
-	                          schema_name_conv.utf8_str, schema_name_conv.utf8_len_smallint(), table_name_conv.utf8_str,
-	                          table_name_conv.utf8_len_smallint(), unique, reserved);
-}
-
 template <typename T>
 static SQLRETURN SetNumericAttributePtr(duckdb::OdbcHandleStmt *hstmt, const T &val, SQLLEN *numeric_attribute_ptr) {
 	if (numeric_attribute_ptr) {

src/statement/statement.cpp

@@ -26,9 +26,9 @@ add_executable(
   tests/multicolumn_param_bind.cpp
   tests/numeric.cpp
   tests/quotes.cpp
+  tests/test_empty_stubs.cpp
   tests/result_conversion.cpp
   tests/test_allowed_paths.cpp
-  tests/test_stubs.cpp
   tests/test_timestamp.cpp
   tests/test_widechar_conv.cpp
   tests/test_widechar_data.cpp